Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
	src/3rdparty
	src/core/certificate_error_controller.cpp
	src/core/certificate_error_controller.h
	src/core/compositor/compositor.cpp
	src/core/compositor/compositor.h
	src/core/compositor/display_gl_output_surface.cpp
	src/core/content_browser_client_qt.cpp
	src/core/core_chromium.pri
	src/core/delegated_frame_host_client_qt.cpp
	src/core/ozone/gl_share_context_qt.h
	src/core/ozone/surface_factory_qt.cpp
	src/core/permission_manager_qt.cpp
	src/core/render_widget_host_view_qt.cpp
	src/core/render_widget_host_view_qt.h
	src/core/web_engine_context.cpp
	src/core/web_engine_settings.cpp
	src/core/web_event_factory.cpp
	tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp

Change-Id: Ice14c3c350b139e800c7c7011b7cef1fc7010669

1 files changed, 9 insertions, 9 deletions

diff --git a/src/core/type_conversion.cpp b/src/core/type_conversion.cpp
index de507f836..bf2656de4 100644
--- a/src/core/type_conversion.cpp
+++ b/src/core/type_conversion.cpp
@@ -39,11 +39,11 @@
 
 #include "type_conversion.h"
 
-#include <content/public/common/favicon_url.h>
 #include <net/cert/x509_certificate.h>
 #include <net/cert/x509_util.h>
 #include <ui/events/event_constants.h>
 #include <ui/gfx/image/image_skia.h>
+#include "third_party/blink/public/mojom/favicon/favicon_url.mojom.h"
 
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/qmatrix4x4.h>
@@ -242,27 +242,27 @@ int flagsFromModifiers(Qt::KeyboardModifiers modifiers)
     return modifierFlags;
 }
 
-FaviconInfo::FaviconTypeFlags toQt(content::FaviconURL::IconType type)
+FaviconInfo::FaviconTypeFlags toQt(blink::mojom::FaviconIconType type)
 {
     switch (type) {
-    case content::FaviconURL::IconType::kFavicon:
+    case blink::mojom::FaviconIconType::kFavicon:
         return FaviconInfo::Favicon;
-    case content::FaviconURL::IconType::kTouchIcon:
+    case blink::mojom::FaviconIconType::kTouchIcon:
         return FaviconInfo::TouchIcon;
-    case content::FaviconURL::IconType::kTouchPrecomposedIcon:
+    case blink::mojom::FaviconIconType::kTouchPrecomposedIcon:
         return FaviconInfo::TouchPrecomposedIcon;
-    case content::FaviconURL::IconType::kInvalid:
+    case blink::mojom::FaviconIconType::kInvalid:
         return FaviconInfo::InvalidIcon;
     }
     Q_UNREACHABLE();
     return FaviconInfo::InvalidIcon;
 }
 
-FaviconInfo toFaviconInfo(const content::FaviconURL &favicon_url)
+FaviconInfo toFaviconInfo(const blink::mojom::FaviconURLPtr &favicon_url)
 {
     FaviconInfo info;
-    info.url = toQt(favicon_url.icon_url);
-    info.type = toQt(favicon_url.icon_type);
+    info.url = toQt(favicon_url->icon_url);
+    info.type = toQt(favicon_url->icon_type);
     // TODO: Add support for rel sizes attribute (favicon_url.icon_sizes):
     // http://www.w3schools.com/tags/att_link_sizes.asp
     info.size = QSize(0, 0);