Adaptations for Chromium 72

Change-Id: Ic355257066c7c1433862cb41e6f2bfa831147e0d
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

39 files changed, 179 insertions, 193 deletions

diff --git a/src/core/accessibility_tree_formatter_qt.cpp b/src/core/accessibility_tree_formatter_qt.cpp
index 8b15c5dee..706857207 100644
--- a/src/core/accessibility_tree_formatter_qt.cpp
+++ b/src/core/accessibility_tree_formatter_qt.cpp
@@ -201,10 +201,10 @@ const std::string AccessibilityTreeFormatterQt::GetDenyString()
 #endif // QT_NO_ACCESSIBILITY
 
 // static
-AccessibilityTreeFormatter* AccessibilityTreeFormatter::Create()
+std::unique_ptr<AccessibilityTreeFormatter> AccessibilityTreeFormatter::Create()
 {
 #ifndef QT_NO_ACCESSIBILITY
-    return new AccessibilityTreeFormatterQt();
+    return std::unique_ptr<AccessibilityTreeFormatter>(new AccessibilityTreeFormatterQt());
 #else
     return nullptr;
 #endif
diff --git a/src/core/browser_main_parts_qt.cpp b/src/core/browser_main_parts_qt.cpp
index 4dbff086b..7e1617802 100644
--- a/src/core/browser_main_parts_qt.cpp
+++ b/src/core/browser_main_parts_qt.cpp
@@ -42,6 +42,8 @@
 #include "api/qwebenginemessagepumpscheduler_p.h"
 
 #include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_impl.h"
+#include "base/message_loop/message_loop_current.h"
 #include "base/process/process.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_parts.h"
@@ -104,6 +106,8 @@ int GetTimeIntervalMilliseconds(const base::TimeTicks &from)
     return delay < 0 ? 0 : delay;
 }
 
+}  // anonymous namespace
+
 class MessagePumpForUIQt : public base::MessagePump
 {
 public:
@@ -134,14 +138,13 @@ public:
     {
         // NOTE: This method may called from any thread at any time.
         if (!m_delegate)
-            m_delegate = base::MessageLoopForUI::current();
+            m_delegate = static_cast<base::MessageLoopImpl*>(base::MessageLoopCurrentForUI::Get().ToMessageLoopBaseDeprecated());
         m_scheduler.scheduleWork();
     }
 
     void ScheduleDelayedWork(const base::TimeTicks &delayed_work_time) override
     {
-        if (!m_delegate)
-            m_delegate = base::MessageLoopForUI::current();
+        Q_ASSERT(m_delegate);
         m_scheduler.scheduleDelayedWork(GetTimeIntervalMilliseconds(delayed_work_time));
     }
 
@@ -215,8 +218,6 @@ private:
     QWebEngineMessagePumpScheduler m_scheduler;
 };
 
-}  // anonymous namespace
-
 std::unique_ptr<base::MessagePump> messagePumpFactory()
 {
     return base::WrapUnique(new MessagePumpForUIQt);
@@ -277,10 +278,9 @@ int BrowserMainPartsQt::PreCreateThreads()
 void BrowserMainPartsQt::ServiceManagerConnectionStarted(content::ServiceManagerConnection *connection)
 {
     ServiceQt::GetInstance()->InitConnector();
-    connection->GetConnector()->StartService(service_manager::Identity("qtwebengine"));
+    connection->GetConnector()->WarmService(service_manager::ServiceFilter::ByName("qtwebengine"));
     m_processResourceCoordinator = std::make_unique<resource_coordinator::ProcessResourceCoordinator>(connection->GetConnector());
-    m_processResourceCoordinator->SetLaunchTime(base::Time::Now());
-    m_processResourceCoordinator->SetPID(base::Process::Current().Pid());
+    m_processResourceCoordinator->OnProcessLaunched(base::Process::Current());
 }
 
 } // namespace QtWebEngineCore
diff --git a/src/core/browser_message_filter_qt.cpp b/src/core/browser_message_filter_qt.cpp
index d4fdc4122..034447512 100644
--- a/src/core/browser_message_filter_qt.cpp
+++ b/src/core/browser_message_filter_qt.cpp
@@ -100,7 +100,6 @@ void BrowserMessageFilterQt::OnAllowDOMStorage(int /*render_frame_id*/,
 void BrowserMessageFilterQt::OnAllowIndexedDB(int /*render_frame_id*/,
                                               const GURL &origin_url,
                                               const GURL &top_origin_url,
-                                              const base::string16 &/*name*/,
                                               bool *allowed)
 {
     NetworkDelegateQt *networkDelegate = static_cast<NetworkDelegateQt *>(m_profile->GetRequestContext()->GetURLRequestContext()->network_delegate());
diff --git a/src/core/browser_message_filter_qt.h b/src/core/browser_message_filter_qt.h
index 8b22ab6ac..d121aa65d 100644
--- a/src/core/browser_message_filter_qt.h
+++ b/src/core/browser_message_filter_qt.h
@@ -73,7 +73,6 @@ private:
     void OnAllowIndexedDB(int render_frame_id,
                           const GURL &origin_url,
                           const GURL &top_origin_url,
-                          const base::string16 &name,
                           bool *allowed);
 
     void OnRequestFileSystemAccessSync(int render_frame_id,
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp
index 44756bdfe..2b0bbae1d 100644
--- a/src/core/clipboard_qt.cpp
+++ b/src/core/clipboard_qt.cpp
@@ -111,8 +111,8 @@ Clipboard::FormatType Clipboard::GetFormatType(const std::string& format_string)
 
 const Clipboard::FormatType& Clipboard::GetPlainTextFormatType()
 {
-    CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeText));
-    return type;
+    static base::NoDestructor<FormatType> type(kMimeTypeText);
+    return *type;
 }
 
 const Clipboard::FormatType& Clipboard::GetPlainTextWFormatType()
@@ -132,38 +132,38 @@ const Clipboard::FormatType& Clipboard::GetUrlWFormatType()
 
 const Clipboard::FormatType& Clipboard::GetHtmlFormatType()
 {
-    CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeHTML));
-    return type;
+    static base::NoDestructor<FormatType> type(kMimeTypeHTML);
+    return *type;
 }
 
 const Clipboard::FormatType& Clipboard::GetRtfFormatType()
 {
-    CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeRTF));
-    return type;
+    static base::NoDestructor<FormatType> type(kMimeTypeRTF);
+    return *type;
 }
 
 const Clipboard::FormatType& Clipboard::GetBitmapFormatType()
 {
-    CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeBitmap));
-    return type;
+    static base::NoDestructor<FormatType> type(kMimeTypeBitmap);
+    return *type;
 }
 
 const Clipboard::FormatType& Clipboard::GetWebKitSmartPasteFormatType()
 {
-    CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebkitSmartPaste));
-    return type;
+    static base::NoDestructor<FormatType> type(kMimeTypeWebkitSmartPaste);
+    return *type;
 }
 
 const Clipboard::FormatType& Clipboard::GetWebCustomDataFormatType()
 {
-    CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebCustomDataCopy));
-    return type;
+    static base::NoDestructor<FormatType> type(kMimeTypeWebCustomData);
+    return *type;
 }
 
 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType()
 {
-    CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData));
-    return type;
+    static base::NoDestructor<FormatType> type(kMimeTypePepperCustomData);
+    return *type;
 }
 
 
diff --git a/src/core/common/qt_messages.cpp b/src/core/common/qt_messages.cpp
index d64db69c9..2f087d21f 100644
--- a/src/core/common/qt_messages.cpp
+++ b/src/core/common/qt_messages.cpp
@@ -10,10 +10,6 @@
 #include "ipc/struct_constructor_macros.h"
 #include "common/qt_messages.h"
 
-// Generate destructors.
-#include "ipc/struct_destructor_macros.h"
-#include "common/qt_messages.h"
-
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {
diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h
index 987d6442b..1862ff29f 100644
--- a/src/core/common/qt_messages.h
+++ b/src/core/common/qt_messages.h
@@ -108,9 +108,8 @@ IPC_MESSAGE_CONTROL4(QtWebEngineHostMsg_RequestFileSystemAccessAsync,
 
 // Sent by the renderer process to check whether access to Indexed DB is
 // granted by content settings.
-IPC_SYNC_MESSAGE_CONTROL4_1(QtWebEngineHostMsg_AllowIndexedDB,
+IPC_SYNC_MESSAGE_CONTROL3_1(QtWebEngineHostMsg_AllowIndexedDB,
                             int /* render_frame_id */,
                             GURL /* origin_url */,
                             GURL /* top origin url */,
-                            base::string16 /* database name */,
                             bool /* allowed */)
diff --git a/src/core/compositor/compositor.cpp b/src/core/compositor/compositor.cpp
index 0660c155b..31fd15961 100644
--- a/src/core/compositor/compositor.cpp
+++ b/src/core/compositor/compositor.cpp
@@ -162,7 +162,7 @@ void Compositor::notifyFrameCommitted()
 void Compositor::sendPresentationFeedback(uint frame_token)
 {
     gfx::PresentationFeedback dummyFeedback(base::TimeTicks::Now(), base::TimeDelta(), gfx::PresentationFeedback::Flags::kVSync);
-    m_frameSinkClient->DidPresentCompositorFrame(frame_token, dummyFeedback);
+    m_presentations.insert({frame_token, dummyFeedback});
 }
 
 bool Compositor::OnBeginFrameDerivedImpl(const viz::BeginFrameArgs &args)
@@ -171,8 +171,10 @@ bool Compositor::OnBeginFrameDerivedImpl(const viz::BeginFrameArgs &args)
 
     ProgressFlingIfNeeded(m_host, args.frame_time);
     m_beginFrameSource->OnUpdateVSyncParameters(args.frame_time, args.interval);
-    if (m_frameSinkClient)
-        m_frameSinkClient->OnBeginFrame(args);
+    if (m_frameSinkClient) {
+        m_frameSinkClient->OnBeginFrame(args, m_presentations);
+        m_presentations.clear();
+    }
 
     return true;
 }
diff --git a/src/core/compositor/compositor.h b/src/core/compositor/compositor.h
index 69f4a530c..6d88dc054 100644
--- a/src/core/compositor/compositor.h
+++ b/src/core/compositor/compositor.h
@@ -40,9 +40,10 @@
 #ifndef COMPOSITOR_H
 #define COMPOSITOR_H
 
-#include <base/memory/weak_ptr.h>
-#include <components/viz/common/frame_sinks/begin_frame_source.h>
-#include <components/viz/common/quads/compositor_frame.h>
+#include "base/memory/weak_ptr.h"
+#include "components/viz/common/frame_sinks/begin_frame_source.h"
+#include "components/viz/common/quads/compositor_frame.h"
+#include "ui/gfx/presentation_feedback.h"
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qshareddata.h>
@@ -114,6 +115,7 @@ private:
     std::unique_ptr<CompositorResourceTracker> m_resourceTracker;
     content::RenderWidgetHost *m_host;
     std::unique_ptr<viz::SyntheticBeginFrameSource> m_beginFrameSource;
+    base::flat_map<uint32_t, gfx::PresentationFeedback> m_presentations;
     viz::mojom::CompositorFrameSinkClient *m_frameSinkClient = nullptr;
     bool m_updatePaintNodeShouldCommit = false;
     bool m_needsBeginFrames = false;
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 7440771cb..866f0feba 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -276,10 +276,11 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost*
     *service_request = mojo::MakeRequest(&service);
     service_manager::mojom::PIDReceiverPtr pid_receiver;
     service_manager::Identity renderer_identity = host->GetChildIdentity();
-    ServiceQt::GetInstance()->connector()->StartService(
+    ServiceQt::GetInstance()->connector()->RegisterServiceInstance(
                 service_manager::Identity("qtwebengine_renderer",
-                                          renderer_identity.user_id(),
-                                          renderer_identity.instance()),
+                                          renderer_identity.instance_group(),
+                                          renderer_identity.instance_id(),
+                                          base::Token::CreateRandom()),
                 std::move(service), mojo::MakeRequest(&pid_receiver));
 }
 
@@ -540,9 +541,10 @@ void ContentBrowserClientQt::BindInterfaceRequestFromFrame(content::RenderFrameH
 
 void ContentBrowserClientQt::RegisterInProcessServices(StaticServiceMap* services, content::ServiceManagerConnection* connection)
 {
-    service_manager::EmbeddedServiceInfo info;
-    info.factory = ServiceQt::GetInstance()->CreateServiceQtFactory();
-    services->insert(std::make_pair("qtwebengine", info));
+    Q_UNUSED(services);
+    connection->AddServiceRequestHandler(
+            "qtwebengine",
+            ServiceQt::GetInstance()->CreateServiceQtRequestHandler());
 }
 
 void ContentBrowserClientQt::RegisterOutOfProcessServices(content::ContentBrowserClient::OutOfProcessServiceMap *services)
@@ -660,8 +662,7 @@ bool ContentBrowserClientQt::AllowGetCookie(const GURL &url,
                                             int /*render_frame_id*/)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    NetworkDelegateQt *networkDelegate = static_cast<NetworkDelegateQt *>(context->GetRequestContext()->network_delegate());
-    return networkDelegate->canGetCookies(first_party, url);
+    return ProfileIODataQt::FromResourceContext(context)->canGetCookies(toQt(first_party), toQt(url));
 }
 
 bool ContentBrowserClientQt::AllowSetCookie(const GURL &url,
@@ -672,8 +673,7 @@ bool ContentBrowserClientQt::AllowSetCookie(const GURL &url,
                                             int /*render_frame_id*/)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    NetworkDelegateQt *networkDelegate = static_cast<NetworkDelegateQt *>(context->GetRequestContext()->network_delegate());
-    return networkDelegate->canSetCookies(first_party, url, std::string());
+    return ProfileIODataQt::FromResourceContext(context)->canSetCookie(toQt(first_party), QByteArray(), toQt(url));
 }
 
 bool ContentBrowserClientQt::AllowAppCache(const GURL &manifest_url,
@@ -681,20 +681,18 @@ bool ContentBrowserClientQt::AllowAppCache(const GURL &manifest_url,
                                            content::ResourceContext *context)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    NetworkDelegateQt *networkDelegate = static_cast<NetworkDelegateQt *>(context->GetRequestContext()->network_delegate());
-    return networkDelegate->canGetCookies(first_party, manifest_url);
+    return ProfileIODataQt::FromResourceContext(context)->canGetCookies(toQt(first_party), toQt(manifest_url));
 }
 
 bool ContentBrowserClientQt::AllowServiceWorker(const GURL &scope,
                                                 const GURL &first_party,
                                                 content::ResourceContext *context,
-                                                const base::Callback<content::WebContents*(void)> &/*wc_getter*/)
+                                                base::RepeatingCallback<content::WebContents*()> wc_getter)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     // FIXME: Chrome also checks if javascript is enabled here to check if has been disabled since the service worker
     // was started.
-    NetworkDelegateQt *networkDelegate = static_cast<NetworkDelegateQt *>(context->GetRequestContext()->network_delegate());
-    return networkDelegate->canGetCookies(first_party, scope);
+    return ProfileIODataQt::FromResourceContext(context)->canGetCookies(toQt(first_party), toQt(scope));
 }
 
 // We control worker access to FS and indexed-db using cookie permissions, this is mirroring Chromium's logic.
@@ -704,18 +702,16 @@ void ContentBrowserClientQt::AllowWorkerFileSystem(const GURL &url,
                                                    base::Callback<void(bool)> callback)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    NetworkDelegateQt *networkDelegate = static_cast<NetworkDelegateQt *>(context->GetRequestContext()->network_delegate());
-    callback.Run(networkDelegate->canSetCookies(url, url, std::string()));
+    callback.Run(ProfileIODataQt::FromResourceContext(context)->canSetCookie(toQt(url), QByteArray(), toQt(url)));
 }
 
+
 bool ContentBrowserClientQt::AllowWorkerIndexedDB(const GURL &url,
-                                                  const base::string16 &/*name*/,
                                                   content::ResourceContext *context,
                                                   const std::vector<content::GlobalFrameRoutingId> &/*render_frames*/)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    NetworkDelegateQt *networkDelegate = static_cast<NetworkDelegateQt *>(context->GetRequestContext()->network_delegate());
-    return networkDelegate->canSetCookies(url, url, std::string());
+    return ProfileIODataQt::FromResourceContext(context)->canSetCookie(toQt(url), QByteArray(), toQt(url));
 }
 
 static void LaunchURL(const GURL& url,
@@ -738,11 +734,15 @@ bool ContentBrowserClientQt::HandleExternalProtocol(
         content::NavigationUIData *navigation_data,
         bool is_main_frame,
         ui::PageTransition page_transition,
-        bool has_user_gesture)
+        bool has_user_gesture,
+        const std::string &method,
+        const net::HttpRequestHeaders &headers)
 {
     Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
     Q_UNUSED(child_id);
     Q_UNUSED(navigation_data);
+    Q_UNUSED(method);
+    Q_UNUSED(headers);
 
     base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
                              base::BindOnce(&LaunchURL,
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 403ff3a9d..8e4ec3c9b 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -161,7 +161,7 @@ public:
     bool AllowServiceWorker(const GURL& scope,
                             const GURL& first_party,
                             content::ResourceContext* context,
-                            const base::Callback<content::WebContents*(void)>& wc_getter) override;
+                            base::RepeatingCallback<content::WebContents*()> wc_getter) override;
 
     void AllowWorkerFileSystem(const GURL &url,
                                content::ResourceContext *context,
@@ -169,7 +169,6 @@ public:
                                base::Callback<void(bool)> callback) override;
 
     bool AllowWorkerIndexedDB(const GURL &url,
-                              const base::string16 &name,
                               content::ResourceContext *context,
                               const std::vector<content::GlobalFrameRoutingId> &render_frames) override;
 
@@ -200,10 +199,12 @@ public:
             const GURL &url,
             content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
             int child_id,
-            content::NavigationUIData  *navigation_data,
+            content::NavigationUIData *navigation_data,
             bool is_main_frame,
             ui::PageTransition page_transition,
-            bool has_user_gesture) override;
+            bool has_user_gesture,
+            const std::string &method,
+            const net::HttpRequestHeaders &headers) override;
 
 private:
     void InitFrameInterfaces();
diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp
index a495ce6f2..05aed8d2b 100644
--- a/src/core/file_picker_controller.cpp
+++ b/src/core/file_picker_controller.cpp
@@ -124,6 +124,7 @@ void FilePickerController::filesSelectedInChooser(const QStringList &filesList)
         m_listener->FileSelectionCanceled();
     else
         m_listener->FileSelected(std::move(chooser_files),
+                                  /* FIXME? */ base::FilePath(),
                                  static_cast<blink::mojom::FileChooserParams::Mode>(this->m_mode));
 }
 
diff --git a/src/core/net/client_cert_store_data.cpp b/src/core/net/client_cert_store_data.cpp
index d1018a063..5a62cb6fe 100644
--- a/src/core/net/client_cert_store_data.cpp
+++ b/src/core/net/client_cert_store_data.cpp
@@ -106,7 +106,9 @@ public:
         return { SSL_SIGN_RSA_PKCS1_SHA1, SSL_SIGN_RSA_PKCS1_SHA512
                , SSL_SIGN_RSA_PKCS1_SHA384, SSL_SIGN_RSA_PKCS1_SHA256 };
     }
-
+    std::string GetProviderName() override {
+        return "qtwebengine";
+    }
 private:
     EVP_PKEY *m_key;
     BIO *m_mem;
diff --git a/src/core/net/network_delegate_qt.cpp b/src/core/net/network_delegate_qt.cpp
index 60478d3ef..31da45314 100644
--- a/src/core/net/network_delegate_qt.cpp
+++ b/src/core/net/network_delegate_qt.cpp
@@ -211,9 +211,11 @@ bool NetworkDelegateQt::OnCanGetCookies(const net::URLRequest& request, const ne
     return canGetCookies(request.site_for_cookies(), request.url());
 }
 
-bool NetworkDelegateQt::OnCanEnablePrivacyMode(const GURL &url, const GURL &site_for_cookies) const
+bool NetworkDelegateQt::OnForcePrivacyMode(const GURL &url, const GURL &site_for_cookies) const
 {
-    return !canGetCookies(site_for_cookies, url);
+    return false;
+// FIXME: This is what the NetworkContext implementation does (changes tst_QWebEngineCookieStore tests since 72)
+//    return !canGetCookies(site_for_cookies, url);
 }
 
 bool NetworkDelegateQt::canSetCookies(const GURL &first_party, const GURL &url, const std::string &cookie_line) const
@@ -277,11 +279,6 @@ bool NetworkDelegateQt::OnCanAccessFile(const net::URLRequest&, const base::File
     return true;
 }
 
-bool NetworkDelegateQt::OnAreExperimentalCookieFeaturesEnabled() const
-{
-    return false;
-}
-
 bool NetworkDelegateQt::OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest&, const GURL&, const GURL&) const
 {
     return false;
diff --git a/src/core/net/network_delegate_qt.h b/src/core/net/network_delegate_qt.h
index 842af5006..53debadcd 100644
--- a/src/core/net/network_delegate_qt.h
+++ b/src/core/net/network_delegate_qt.h
@@ -77,8 +77,7 @@ public:
     net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, AuthCallback, net::AuthCredentials*) override;
     bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&, bool) override;
     bool OnCanAccessFile(const net::URLRequest&, const base::FilePath&, const base::FilePath&) const override;
-    bool OnCanEnablePrivacyMode(const GURL&, const GURL&) const override;
-    bool OnAreExperimentalCookieFeaturesEnabled() const override;
+    bool OnForcePrivacyMode(const GURL&, const GURL&) const override;
     bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest&, const GURL&, const GURL&) const override;
 
     bool OnCanQueueReportingReport(const url::Origin& origin) const override;
diff --git a/src/core/net/proxy_config_service_qt.cpp b/src/core/net/proxy_config_service_qt.cpp
index ff8ab20aa..00ff1c54d 100644
--- a/src/core/net/proxy_config_service_qt.cpp
+++ b/src/core/net/proxy_config_service_qt.cpp
@@ -143,7 +143,7 @@ net::ProxyConfigService::ConfigAvailability ProxyConfigServiceQt::GetLatestProxy
         qtRules.type = net::ProxyConfig::ProxyRules::Type::EMPTY;
     }
 
-    qtRules.bypass_rules.AddRuleToBypassLocal(); // don't use proxy for connections to localhost
+    qtRules.bypass_rules.PrependRuleToBypassSimpleHostnames(); // don't use proxy for connections to localhost
     m_qtProxyConfig.proxy_rules() = qtRules;
     *config = net::ProxyConfigWithAnnotation(m_qtProxyConfig, config->traffic_annotation());
     return CONFIG_VALID;
diff --git a/src/core/printing/print_view_manager_base_qt.cpp b/src/core/printing/print_view_manager_base_qt.cpp
index 1a16be69e..52f4481bb 100644
--- a/src/core/printing/print_view_manager_base_qt.cpp
+++ b/src/core/printing/print_view_manager_base_qt.cpp
@@ -455,7 +455,7 @@ bool PrintViewManagerBaseQt::RunInnerMessageLoop() {
 
   // Need to enable recursive task.
   {
-      base::MessageLoop::ScopedNestableTaskAllower allow;
+      base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
       run_loop.Run();
   }
 
diff --git a/src/core/printing/print_view_manager_qt.cpp b/src/core/printing/print_view_manager_qt.cpp
index e88f48624..9c0896d92 100644
--- a/src/core/printing/print_view_manager_qt.cpp
+++ b/src/core/printing/print_view_manager_qt.cpp
@@ -98,7 +98,7 @@ static void SavePdfFile(scoped_refptr<base::RefCountedBytes> data,
                         const base::FilePath &path,
                         const QtWebEngineCore::PrintViewManagerQt::PrintToPDFFileCallback &saveCallback)
 {
-    base::AssertBlockingAllowed();
+    base::AssertBlockingAllowedDeprecated();
     DCHECK_GT(data->size(), 0U);
 
     printing::MetafileSkia metafile;
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp
index a73a7c21d..638f949df 100644
--- a/src/core/profile_io_data_qt.cpp
+++ b/src/core/profile_io_data_qt.cpp
@@ -163,7 +163,6 @@ static net::HttpNetworkSession::Params generateNetworkSessionParams(bool ignoreC
 {
     net::HttpNetworkSession::Params network_session_params;
     network_session_params.ignore_certificate_errors = ignoreCertificateErrors;
-    network_session_params.enable_channel_id = base::FeatureList::IsEnabled(features::kChannelID);
     return network_session_params;
 }
 
@@ -666,10 +665,10 @@ void ProfileIODataQt::updateStorageSettings()
     QMutexLocker lock(&m_mutex);
     setFullConfiguration();
 
-    std::string userId = content::BrowserContext::GetServiceUserIdFor(m_profile);
-    if (file::GetUserDirForUserId(userId) != toFilePath(m_profileAdapter->dataPath())) {
-        file::ForgetServiceUserIdUserDirAssociation(userId);
-        file::AssociateServiceUserIdWithUserDir(userId, toFilePath(m_profileAdapter->dataPath()));
+    base::Token groupId = content::BrowserContext::GetServiceInstanceGroupFor(m_profile);
+    if (file::GetUserDirForInstanceGroup(groupId) != toFilePath(m_profileAdapter->dataPath())) {
+        file::ForgetServiceInstanceGroupUserDirAssociation(groupId);
+        file::AssociateServiceInstanceGroupWithUserDir(groupId, toFilePath(m_profileAdapter->dataPath()));
     }
     requestStorageGeneration();
 }
diff --git a/src/core/profile_qt.h b/src/core/profile_qt.h
index 41eeeecf5..a5b37dbd5 100644
--- a/src/core/profile_qt.h
+++ b/src/core/profile_qt.h
@@ -71,9 +71,10 @@ public:
 
     virtual ~ProfileQt();
 
+    base::FilePath GetCachePath() const;
+
     // BrowserContext implementation:
     base::FilePath GetPath() const override;
-    base::FilePath GetCachePath() const override;
     bool IsOffTheRecord() const override;
 
     net::URLRequestContextGetter *CreateMediaRequestContext() override;
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 9791c8c46..6d3460e0f 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -905,7 +905,7 @@ viz::ScopedSurfaceIdAllocator RenderWidgetHostViewQt::DidUpdateVisualProperties(
 
 void RenderWidgetHostViewQt::OnDidUpdateVisualPropertiesComplete(const cc::RenderFrameMetadata &metadata)
 {
-    synchronizeVisualProperties(metadata.local_surface_id);
+    synchronizeVisualProperties(metadata.local_surface_allocation_id);
 }
 
 QSGNode *RenderWidgetHostViewQt::updatePaintNode(QSGNode *oldNode)
@@ -1685,9 +1685,9 @@ const viz::FrameSinkId &RenderWidgetHostViewQt::GetFrameSinkId() const
     return m_frameSinkId;
 }
 
-const viz::LocalSurfaceId &RenderWidgetHostViewQt::GetLocalSurfaceId() const
+const viz::LocalSurfaceIdAllocation &RenderWidgetHostViewQt::GetLocalSurfaceIdAllocation() const
 {
-    return m_localSurfaceIdAllocator.GetCurrentLocalSurfaceId();
+    return m_localSurfaceIdAllocator.GetCurrentLocalSurfaceIdAllocation();
 }
 
 void RenderWidgetHostViewQt::TakeFallbackContentFrom(content::RenderWidgetHostView *view)
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 70b4f509e..d1f58d445 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -163,7 +163,7 @@ public:
     void SetWantsAnimateOnlyBeginFrames() override;
     viz::SurfaceId GetCurrentSurfaceId() const override;
     const viz::FrameSinkId &GetFrameSinkId() const override;
-    const viz::LocalSurfaceId &GetLocalSurfaceId() const override;
+    const viz::LocalSurfaceIdAllocation &GetLocalSurfaceIdAllocation() const override;
     void TakeFallbackContentFrom(content::RenderWidgetHostView *view) override;
     void EnsureSurfaceSynchronizedForLayoutTest() override;
     uint32_t GetCaptureSequenceNumber() const override;
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index f68370a24..a166186a5 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -68,6 +68,8 @@
 #include "media/base/key_system_properties.h"
 #include "media/media_buildflags.h"
 #include "net/base/net_errors.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "third_party/blink/public/platform/web_url_error.h"
 #include "third_party/blink/public/platform/web_url_request.h"
@@ -112,6 +114,7 @@ namespace QtWebEngineCore {
 static const char kHttpErrorDomain[] = "http";
 
 ContentRendererClientQt::ContentRendererClientQt()
+    : m_serviceBinding(this)
 {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     extensions::ExtensionsClient::Set(extensions::ExtensionsClientQt::GetInstance());
@@ -149,7 +152,7 @@ void ContentRendererClientQt::RenderThreadStarted()
     blink::WebURL qrc(blink::KURL("qrc:"));
     blink::WebString file(blink::WebString::FromASCII("file"));
     blink::WebSecurityPolicy::AddOriginAccessAllowListEntry(qrc, file, blink::WebString(), true,
-                                                            network::mojom::CORSOriginAccessMatchPriority::kDefaultPriority);
+                                                            network::mojom::CorsOriginAccessMatchPriority::kDefaultPriority);
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     ExtensionsRendererClientQt::GetInstance()->RenderThreadStarted();
 #endif
@@ -237,23 +240,23 @@ bool ContentRendererClientQt::ShouldSuppressErrorPage(content::RenderFrame *fram
 // To tap into the chromium localized strings. Ripped from the chrome layer (highly simplified).
 void ContentRendererClientQt::PrepareErrorPage(content::RenderFrame* renderFrame, const blink::WebURLRequest &failedRequest,
                                                const blink::WebURLError &web_error,
-                                               std::string *errorHtml, base::string16 *errorDescription)
+                                               std::string *errorHtml)
 {
     GetNavigationErrorStringsInternal(renderFrame, failedRequest,
                                       error_page::Error::NetError(web_error.url(), web_error.reason(), web_error.has_copy_in_cache()),
-                                      errorHtml, errorDescription);
+                                      errorHtml);
 }
 
 void ContentRendererClientQt::PrepareErrorPageForHttpStatusError(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest,
                                                                  const GURL& unreachable_url, int http_status,
-                                                                 std::string* errorHtml, base::string16* errorDescription)
+                                                                 std::string* errorHtml)
 {
     GetNavigationErrorStringsInternal(renderFrame, failedRequest,
                                       error_page::Error::HttpError(unreachable_url, http_status),
-                                      errorHtml, errorDescription);
+                                      errorHtml);
 }
 
-void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderFrame *renderFrame, const blink::WebURLRequest &failedRequest, const error_page::Error &error, std::string *errorHtml, base::string16 *errorDescription)
+void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderFrame *renderFrame, const blink::WebURLRequest &failedRequest, const error_page::Error &error, std::string *errorHtml)
 {
     Q_UNUSED(renderFrame)
     const bool isPost = QByteArray::fromStdString(failedRequest.HttpMethod().Utf8()) == QByteArrayLiteral("POST");
@@ -271,7 +274,7 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF
             error.reason(), error.domain(), error.url(), isPost,
             error.stale_copy_in_cache(), false, false,
             error_page::LocalizedError::OfflineContentOnNetErrorFeatureState::kDisabled,
-            locale, std::unique_ptr<error_page::ErrorPageParams>(), &errorStrings);
+            false, locale, std::unique_ptr<error_page::ErrorPageParams>(), &errorStrings);
         resourceId = IDR_NET_ERROR_HTML;
 
         const base::StringPiece template_html(ui::ResourceBundle::GetSharedInstance().GetRawDataResource(resourceId));
@@ -280,9 +283,6 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF
         else // "t" is the id of the templates root node.
             *errorHtml = webui::GetTemplatesHtml(template_html, &errorStrings, "t");
     }
-
-    if (errorDescription)
-        *errorDescription = error_page::LocalizedError::GetErrorDetails(error.domain(), error.reason(), isPost);
 }
 
 unsigned long long ContentRendererClientQt::VisitedLinkHash(const char *canonicalUrl, size_t length)
@@ -323,11 +323,6 @@ content::BrowserPluginDelegate* ContentRendererClientQt::CreateBrowserPluginDele
 #endif
 }
 
-void ContentRendererClientQt::OnStart()
-{
-    context()->connector()->BindConnectorRequest(std::move(m_connectorRequest));
-}
-
 void ContentRendererClientQt::OnBindInterface(const service_manager::BindSourceInfo &remote_info,
                                               const std::string& name,
                                               mojo::ScopedMessagePipeHandle handle)
@@ -338,11 +333,9 @@ void ContentRendererClientQt::OnBindInterface(const service_manager::BindSourceI
 
 void ContentRendererClientQt::GetInterface(const std::string &interface_name, mojo::ScopedMessagePipeHandle interface_pipe)
 {
-    if (!m_connector)
-        return;
-    m_connector->BindInterface(service_manager::Identity("qtwebengine"),
-                               interface_name,
-                               std::move(interface_pipe));
+    m_serviceBinding.GetConnector()->BindInterface(
+        service_manager::ServiceFilter::ByName("qtwebengine"),
+        interface_name, std::move(interface_pipe));
 }
 
 // The following is based on chrome/renderer/media/chrome_key_systems.cc:
@@ -568,16 +561,13 @@ void ContentRendererClientQt::WillSendRequest(blink::WebLocalFrame *frame,
 
 void ContentRendererClientQt::CreateRendererService(service_manager::mojom::ServiceRequest service_request)
 {
-    m_serviceContext = std::make_unique<service_manager::ServiceContext>(
-                std::make_unique<service_manager::ForwardingService>(this),
-                std::move(service_request));
+    DCHECK(!m_serviceBinding.is_bound());
+    m_serviceBinding.Bind(std::move(service_request));
 }
 
 service_manager::Connector* ContentRendererClientQt::GetConnector()
 {
-    if (!m_connector)
-        m_connector = service_manager::Connector::Create(&m_connectorRequest);
-    return m_connector.get();
+    return m_serviceBinding.GetConnector();
 }
 
 } // namespace
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 8955a3797..9ec48cb2c 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -46,6 +46,7 @@
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/local_interface_provider.h"
 #include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_binding.h"
 
 #include <QScopedPointer>
 
@@ -85,11 +86,12 @@ public:
     void RenderFrameCreated(content::RenderFrame* render_frame) override;
     bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) override;
     bool HasErrorPage(int http_status_code) override;
+
     void PrepareErrorPage(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest,
-                          const blink::WebURLError& error, std::string* errorHtml, base::string16* errorDescription) override;
+                          const blink::WebURLError& error, std::string* errorHtml) override;
     void PrepareErrorPageForHttpStatusError(content::RenderFrame* render_frame, const blink::WebURLRequest& failed_request,
                                             const GURL& unreachable_url, int http_status,
-                                            std::string* error_html, base::string16* error_description) override;
+                                            std::string* error_html) override;
 
     unsigned long long VisitedLinkHash(const char *canonicalUrl, size_t length) override;
     bool IsLinkVisited(unsigned long long linkHash) override;
@@ -120,7 +122,6 @@ private:
     service_manager::Connector *GetConnector();
 
     // service_manager::Service:
-    void OnStart() override;
     void OnBindInterface(const service_manager::BindSourceInfo &remote_info,
                          const std::string &name,
                          mojo::ScopedMessagePipeHandle handle) override;
@@ -129,7 +130,7 @@ private:
     void GetInterface(const std::string& name, mojo::ScopedMessagePipeHandle request_handle) override;
 
     void GetNavigationErrorStringsInternal(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest,
-                                           const error_page::Error& error, std::string* errorHtml, base::string16* errorDescription);
+                                           const error_page::Error& error, std::string* errorHtml);
 
     QScopedPointer<visitedlink::VisitedLinkSlave> m_visitedLinkSlave;
     QScopedPointer<web_cache::WebCacheImpl> m_webCacheImpl;
@@ -137,9 +138,8 @@ private:
     QScopedPointer<SpellCheck> m_spellCheck;
 #endif
 
-    std::unique_ptr<service_manager::Connector> m_connector;
     service_manager::mojom::ConnectorRequest m_connectorRequest;
-    std::unique_ptr<service_manager::ServiceContext> m_serviceContext;
+    service_manager::ServiceBinding m_serviceBinding;
     service_manager::BinderRegistry m_registry;
     std::unique_ptr<network_hints::PrescientNetworkingDispatcher> m_prescientNetworkingDispatcher;
 
diff --git a/src/core/renderer/content_settings_observer_qt.cpp b/src/core/renderer/content_settings_observer_qt.cpp
index c1495e1fe..98954eb4a 100644
--- a/src/core/renderer/content_settings_observer_qt.cpp
+++ b/src/core/renderer/content_settings_observer_qt.cpp
@@ -151,8 +151,7 @@ void ContentSettingsObserverQt::RequestFileSystemAccessAsync(const WebContentSet
              url::Origin(frame->Top()->GetSecurityOrigin()).GetURL()));
 }
 
-bool ContentSettingsObserverQt::AllowIndexedDB(const WebString &name,
-                                               const WebSecurityOrigin &/*origin*/)
+bool ContentSettingsObserverQt::AllowIndexedDB(const WebSecurityOrigin &origin)
 {
     blink::WebFrame *frame = render_frame()->GetWebFrame();
     if (IsUniqueFrame(frame))
@@ -160,8 +159,8 @@ bool ContentSettingsObserverQt::AllowIndexedDB(const WebString &name,
 
     bool result = false;
     Send(new QtWebEngineHostMsg_AllowIndexedDB(
-             routing_id(), url::Origin(frame->GetSecurityOrigin()).GetURL(),
-             url::Origin(frame->Top()->GetSecurityOrigin()).GetURL(), name.Utf16(),
+             routing_id(), url::Origin(origin).GetURL(),
+             url::Origin(frame->Top()->GetSecurityOrigin()).GetURL(),
              &result));
     return result;
 }
diff --git a/src/core/renderer/content_settings_observer_qt.h b/src/core/renderer/content_settings_observer_qt.h
index a9bee3d2d..69b0eda9e 100644
--- a/src/core/renderer/content_settings_observer_qt.h
+++ b/src/core/renderer/content_settings_observer_qt.h
@@ -72,8 +72,7 @@ public:
                        const blink::WebString &display_name,
                        unsigned estimated_size) override;
     void RequestFileSystemAccessAsync(const blink::WebContentSettingCallbacks &callbacks) override;
-    bool AllowIndexedDB(const blink::WebString &name,
-                        const blink::WebSecurityOrigin &origin) override;
+    bool AllowIndexedDB(const blink::WebSecurityOrigin &origin) override;
     bool AllowStorage(bool local) override;
 
 private:
diff --git a/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp b/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp
index 5d21201ba..9ad59f939 100644
--- a/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp
+++ b/src/core/renderer/pepper/pepper_flash_renderer_host_qt.cpp
@@ -301,7 +301,7 @@ int32_t PepperFlashRendererHostQt::OnDrawGlyphs(
     paint.setColor(params.color);
     paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
     paint.setAntiAlias(true);
-    paint.setHinting(SkPaint::kFull_Hinting);
+    paint.setHinting(SkFontHinting::kFull);
     paint.setTextSize(SkIntToScalar(params.font_desc.size));
     paint.setTypeface(std::move(typeface));
     if (params.allow_subpixel_aa) {
diff --git a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp
index 007aa9b63..442694bb9 100644
--- a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp
+++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp
@@ -70,7 +70,7 @@
 #include "net/base/escape.h"
 #include "net/url_request/url_request.h"
 
-#include "resource_context_qt.h"
+#include "profile_io_data_qt.h"
 #include "type_conversion.h"
 #include "web_contents_delegate_qt.h"
 #include "web_engine_settings.h"
@@ -128,10 +128,9 @@ bool ResourceDispatcherHostDelegateQt::ShouldInterceptResourceAsStream(net::URLR
     if (!content::ResourceRequestInfo::GetRenderFrameForRequest(request, &render_process_host_id, &render_frame_id))
         return false;
 
-    ResourceContextQt *context = static_cast<ResourceContextQt *>(info->GetContext());
     std::vector<std::string> whitelist = MimeTypesHandler::GetMIMETypeWhitelist();
 
-    extensions::ExtensionSystemQt *extensionSystem = context->GetExtensionSystem();
+    extensions::ExtensionSystemQt *extensionSystem = ProfileIODataQt::FromResourceContext(info->GetContext())->GetExtensionSystem();
     if (!extensionSystem)
         return false;
 
diff --git a/src/core/resource_context_qt.cpp b/src/core/resource_context_qt.cpp
index 78be72107..79c105956 100644
--- a/src/core/resource_context_qt.cpp
+++ b/src/core/resource_context_qt.cpp
@@ -39,15 +39,6 @@
 
 #include "resource_context_qt.h"
 
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/storage_partition.h"
-#include "net/dns/host_resolver.h"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_getter.h"
-#include "profile_io_data_qt.h"
-
-#include <qglobal.h>
-
 namespace QtWebEngineCore {
 
 ResourceContextQt::ResourceContextQt(ProfileIODataQt *io_data)
@@ -55,20 +46,4 @@ ResourceContextQt::ResourceContextQt(ProfileIODataQt *io_data)
 {
 }
 
-net::URLRequestContext* ResourceContextQt::GetRequestContext()
-{
-    Q_ASSERT(m_io_data);
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    // FIXME: This is the only remaining use of GetRequestContext(),
-    // but we are on the wrong thread for calling BrowserContext::GetDefaultStoragePartition
-    return m_io_data->urlRequestContext();
-}
-
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-extensions::ExtensionSystemQt* ResourceContextQt::GetExtensionSystem()
-{
-    return m_io_data->GetExtensionSystem();
-}
-#endif // BUILDFLAG(ENABLE_EXTENSIONS)
-
 } // namespace QtWebEngineCore
diff --git a/src/core/resource_context_qt.h b/src/core/resource_context_qt.h
index ccbe2c364..4107e7c24 100644
--- a/src/core/resource_context_qt.h
+++ b/src/core/resource_context_qt.h
@@ -45,6 +45,7 @@
 #include "extensions/buildflags/buildflags.h"
 
 namespace net {
+class URLRequestContext;
 class URLRequestContextGetter;
 }
 
@@ -64,10 +65,6 @@ class ResourceContextQt : public content::ResourceContext
 {
 public:
     ResourceContextQt(ProfileIODataQt *io_data);
-    net::URLRequestContext *GetRequestContext() override;
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-    extensions::ExtensionSystemQt* GetExtensionSystem();
-#endif // BUILDFLAG(ENABLE_EXTENSIONS)
 private:
     friend class ProfileIODataQt;
     ProfileIODataQt* m_io_data;
diff --git a/src/core/service/service_qt.cpp b/src/core/service/service_qt.cpp
index bb842232c..83948e396 100644
--- a/src/core/service/service_qt.cpp
+++ b/src/core/service/service_qt.cpp
@@ -53,7 +53,7 @@
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
-#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_binding.h"
 
 #if BUILDFLAG(ENABLE_SPELLCHECK)
 #include "chrome/browser/spellchecker/spell_check_host_chrome_impl.h"
@@ -64,6 +64,7 @@ public:
     IOThreadContext();
     ~IOThreadContext() override = default;
 
+    void BindServiceRequest(service_manager::mojom::ServiceRequest request);
     void BindConnector(service_manager::mojom::ConnectorRequest connector_request);
 
 private:
@@ -76,6 +77,7 @@ private:
                          mojo::ScopedMessagePipeHandle handle) override;
 
     service_manager::mojom::ConnectorRequest m_connectorRequest;
+    service_manager::ServiceBinding m_serviceBinding{this};
     service_manager::BinderRegistry m_registry;
     service_manager::BinderRegistryWithArgs<const service_manager::BindSourceInfo&> m_registry_with_source_info;
 
@@ -91,6 +93,11 @@ ServiceQt::IOThreadContext::IOThreadContext()
 #endif
 }
 
+void ServiceQt::IOThreadContext::BindServiceRequest(service_manager::mojom::ServiceRequest request)
+{
+    m_serviceBinding.Bind(std::move(request));
+}
+
 void ServiceQt::IOThreadContext::BindConnector(service_manager::mojom::ConnectorRequest connector_request)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -116,7 +123,7 @@ void ServiceQt::IOThreadContext::OnStart()
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     DCHECK(m_connectorRequest.is_pending());
-    context()->connector()->BindConnectorRequest(std::move(m_connectorRequest));
+    m_serviceBinding.GetConnector()->BindConnectorRequest(std::move(m_connectorRequest));
 }
 
 void ServiceQt::IOThreadContext::OnBindInterface(const service_manager::BindSourceInfo &remote_info,
@@ -138,9 +145,9 @@ ServiceQt *ServiceQt::GetInstance()
     return service.get();
 }
 
-service_manager::EmbeddedServiceInfo::ServiceFactory ServiceQt::CreateServiceQtFactory()
+content::ServiceManagerConnection::ServiceRequestHandler ServiceQt::CreateServiceQtRequestHandler()
 {
-    return base::BindRepeating(&ServiceQt::CreateServiceQtWrapper, base::Unretained(this));
+    return base::BindRepeating(&ServiceQt::BindServiceQtRequest, base::Unretained(this));
 }
 
 ServiceQt::ServiceQt() : m_ioThreadContext(std::make_unique<IOThreadContext>())
@@ -155,8 +162,8 @@ void ServiceQt::InitConnector()
     m_ioThreadContext->BindConnector(std::move(request));
 }
 
-std::unique_ptr<service_manager::Service> ServiceQt::CreateServiceQtWrapper()
+void ServiceQt::BindServiceQtRequest(service_manager::mojom::ServiceRequest request)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    return std::make_unique<service_manager::ForwardingService>(m_ioThreadContext.get());
+    m_ioThreadContext->BindServiceRequest(std::move(request));
 }
diff --git a/src/core/service/service_qt.h b/src/core/service/service_qt.h
index 4aa0a3996..d4c89065c 100644
--- a/src/core/service/service_qt.h
+++ b/src/core/service/service_qt.h
@@ -41,7 +41,7 @@
 #define SERVICE_QT_H
 
 #include "base/no_destructor.h"
-#include "services/service_manager/embedder/embedded_service_info.h"
+#include "content/public/common/service_manager_connection.h"
 
 namespace service_manager {
 class Connector;
@@ -53,7 +53,7 @@ public:
     static ServiceQt *GetInstance();
 
     void InitConnector();
-    service_manager::EmbeddedServiceInfo::ServiceFactory CreateServiceQtFactory();
+    content::ServiceManagerConnection::ServiceRequestHandler CreateServiceQtRequestHandler();
     service_manager::Connector *connector() { return m_connector.get(); }
 
 private:
@@ -63,7 +63,7 @@ private:
     ServiceQt();
     ~ServiceQt();
 
-    std::unique_ptr<service_manager::Service> CreateServiceQtWrapper();
+    void BindServiceQtRequest(service_manager::mojom::ServiceRequest request);
 
     const std::unique_ptr<IOThreadContext> m_ioThreadContext;
 
diff --git a/src/core/touch_selection_controller_client_qt.h b/src/core/touch_selection_controller_client_qt.h
index cdc45cac3..0d8dcf696 100644
--- a/src/core/touch_selection_controller_client_qt.h
+++ b/src/core/touch_selection_controller_client_qt.h
@@ -73,6 +73,8 @@ public:
     bool IsCommandIdEnabled(int command_id) const override;
     void ExecuteCommand(int command_id, int event_flags) override;
     void RunContextMenu() override;
+    bool ShouldShowQuickMenu() override { return false; }
+    base::string16 GetSelectedText() override { return base::string16(); }
 
     // content::TouchSelectionControllerClientManager overrides
     void DidStopFlinging() override;
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 607412e16..535c50a95 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -61,6 +61,7 @@
 #include "web_engine_settings.h"
 
 #include "base/command_line.h"
+#include "base/message_loop/message_loop_impl.h"
 #include "base/run_loop.h"
 #include "base/task/post_task.h"
 #include "base/values.h"
@@ -333,7 +334,7 @@ static void deserializeNavigationHistory(QDataStream &input, int *currentIndex,
 
         std::unique_ptr<content::NavigationEntry> entry = content::NavigationController::CreateNavigationEntry(
             toGurl(virtualUrl),
-            content::Referrer(toGurl(referrerUrl), static_cast<blink::WebReferrerPolicy>(referrerPolicy)),
+            content::Referrer(toGurl(referrerUrl), static_cast<network::mojom::ReferrerPolicy>(referrerPolicy)),
             // Use a transition type of reload so that we don't incorrectly
             // increase the typed count.
             ui::PAGE_TRANSITION_RELOAD,
@@ -494,7 +495,7 @@ void WebContentsAdapter::initialize(content::SiteInstance *site)
 #endif
     // Set web-contents font settings to the default font settings as Chromium constantly overrides
     // the global font defaults with the font settings of the latest web-contents created.
-    CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL)));
+    static const gfx::FontRenderParams params = gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), nullptr);
     rendererPrefs->should_antialias_text = params.antialiasing;
     rendererPrefs->use_subpixel_positioning = params.subpixel_positioning;
     rendererPrefs->hinting = params.hinting;
@@ -1084,7 +1085,7 @@ void WebContentsAdapter::download(const QUrl &url, const QString &suggestedFileN
     content::Referrer referrer = content::Referrer::SanitizeForRequest(
                 gurl,
                 content::Referrer(toGurl(referrerUrl).GetAsReferrer(),
-                                  static_cast<blink::WebReferrerPolicy>(referrerPolicy)));
+                                  static_cast<network::mojom::ReferrerPolicy>(referrerPolicy)));
 
     params->set_referrer(referrer.url);
     params->set_referrer_policy(content::Referrer::ReferrerPolicyForUrlRequest(referrer.policy));
@@ -1116,16 +1117,30 @@ void WebContentsAdapter::copyImageAt(const QPoint &location)
     m_webContents->GetRenderViewHost()->GetMainFrame()->CopyImageAt(location.x(), location.y());
 }
 
-ASSERT_ENUMS_MATCH(WebContentsAdapter::MediaPlayerNoAction, blink::WebMediaPlayerAction::kUnknown)
-ASSERT_ENUMS_MATCH(WebContentsAdapter::MediaPlayerPlay, blink::WebMediaPlayerAction::kPlay)
-ASSERT_ENUMS_MATCH(WebContentsAdapter::MediaPlayerMute, blink::WebMediaPlayerAction::kMute)
-ASSERT_ENUMS_MATCH(WebContentsAdapter::MediaPlayerLoop,  blink::WebMediaPlayerAction::kLoop)
-ASSERT_ENUMS_MATCH(WebContentsAdapter::MediaPlayerControls,  blink::WebMediaPlayerAction::kControls)
+static blink::WebMediaPlayerAction::Type toBlinkMediaPlayerActionType(WebContentsAdapter::MediaPlayerAction action)
+{
+    switch (action) {
+    case WebContentsAdapter::MediaPlayerPlay:
+        return blink::WebMediaPlayerAction::Type::kPlay;
+    case WebContentsAdapter::MediaPlayerMute:
+        return blink::WebMediaPlayerAction::Type::kMute;
+    case WebContentsAdapter::MediaPlayerLoop:
+        return blink::WebMediaPlayerAction::Type::kLoop;
+    case WebContentsAdapter::MediaPlayerControls:
+        return blink::WebMediaPlayerAction::Type::kControls;
+    case WebContentsAdapter::MediaPlayerNoAction:
+        break;
+    }
+    NOTREACHED();
+    return (blink::WebMediaPlayerAction::Type)-1;
+}
 
 void WebContentsAdapter::executeMediaPlayerActionAt(const QPoint &location, MediaPlayerAction action, bool enable)
 {
     CHECK_INITIALIZED();
-    blink::WebMediaPlayerAction blinkAction((blink::WebMediaPlayerAction::Type)action, enable);
+    if (action == MediaPlayerNoAction)
+        return;
+    blink::WebMediaPlayerAction blinkAction(toBlinkMediaPlayerActionType(action), enable);
     m_webContents->GetRenderViewHost()->GetMainFrame()->ExecuteMediaPlayerActionAtLocation(toGfx(location), blinkAction);
 }
 
@@ -1402,7 +1417,7 @@ void WebContentsAdapter::startDragging(QObject *dragSource, const content::DropD
     }
 
     {
-        base::MessageLoop::ScopedNestableTaskAllower allow;
+        base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
         drag->exec(allowedActions);
     }
 
@@ -1546,7 +1561,7 @@ void WebContentsAdapter::waitForUpdateDragActionCalled()
     const qint64 timeout = 3000;
     QElapsedTimer t;
     t.start();
-    base::MessagePump::Delegate *delegate = base::MessageLoop::current();
+    base::MessagePump::Delegate *delegate = static_cast<base::MessageLoopImpl *>(base::MessageLoopCurrent::Get().ToMessageLoopBaseDeprecated());
     DCHECK(delegate);
     m_updateDragActionCalled = false;
     for (;;) {
@@ -1675,15 +1690,15 @@ ASSERT_ENUMS_MATCH(WebContentsAdapterClient::SaveToDiskDisposition, WindowOpenDi
 ASSERT_ENUMS_MATCH(WebContentsAdapterClient::OffTheRecordDisposition, WindowOpenDisposition::OFF_THE_RECORD)
 ASSERT_ENUMS_MATCH(WebContentsAdapterClient::IgnoreActionDisposition, WindowOpenDisposition::IGNORE_ACTION)
 
-ASSERT_ENUMS_MATCH(ReferrerPolicy::Always, blink::kWebReferrerPolicyAlways)
-ASSERT_ENUMS_MATCH(ReferrerPolicy::Default, blink::kWebReferrerPolicyDefault)
-ASSERT_ENUMS_MATCH(ReferrerPolicy::NoReferrerWhenDowngrade, blink::kWebReferrerPolicyNoReferrerWhenDowngrade)
-ASSERT_ENUMS_MATCH(ReferrerPolicy::Never, blink::kWebReferrerPolicyNever)
-ASSERT_ENUMS_MATCH(ReferrerPolicy::Origin, blink::kWebReferrerPolicyOrigin)
-ASSERT_ENUMS_MATCH(ReferrerPolicy::OriginWhenCrossOrigin, blink::kWebReferrerPolicyOriginWhenCrossOrigin)
-ASSERT_ENUMS_MATCH(ReferrerPolicy::NoReferrerWhenDowngradeOriginWhenCrossOrigin, blink::kWebReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin)
-ASSERT_ENUMS_MATCH(ReferrerPolicy::SameOrigin, blink::kWebReferrerPolicySameOrigin)
-ASSERT_ENUMS_MATCH(ReferrerPolicy::StrictOrigin, blink::kWebReferrerPolicyStrictOrigin)
-ASSERT_ENUMS_MATCH(ReferrerPolicy::Last, blink::kWebReferrerPolicyLast)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::Always, network::mojom::ReferrerPolicy::kAlways)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::Default, network::mojom::ReferrerPolicy::kDefault)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::NoReferrerWhenDowngrade, network::mojom::ReferrerPolicy::kNoReferrerWhenDowngrade)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::Never, network::mojom::ReferrerPolicy::kNever)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::Origin, network::mojom::ReferrerPolicy::kOrigin)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::OriginWhenCrossOrigin, network::mojom::ReferrerPolicy::kOriginWhenCrossOrigin)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::NoReferrerWhenDowngradeOriginWhenCrossOrigin, network::mojom::ReferrerPolicy::kNoReferrerWhenDowngradeOriginWhenCrossOrigin)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::SameOrigin, network::mojom::ReferrerPolicy::kSameOrigin)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::StrictOrigin, network::mojom::ReferrerPolicy::kStrictOrigin)
+ASSERT_ENUMS_MATCH(ReferrerPolicy::Last, network::mojom::ReferrerPolicy::kLast)
 
 } // namespace QtWebEngineCore
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index ade29c770..7c6741723 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -248,11 +248,13 @@ void WebContentsDelegateQt::LoadProgressChanged(content::WebContents */*source*/
     m_viewClient->loadProgressChanged(m_lastLoadProgress);
 }
 
-void WebContentsDelegateQt::HandleKeyboardEvent(content::WebContents *, const content::NativeWebKeyboardEvent &event)
+bool WebContentsDelegateQt::HandleKeyboardEvent(content::WebContents *, const content::NativeWebKeyboardEvent &event)
 {
     Q_ASSERT(!event.skip_in_browser);
     if (event.os_event)
         m_viewClient->unhandledKeyEvent(reinterpret_cast<QKeyEvent *>(event.os_event));
+    // FIXME: ?
+    return true;
 }
 
 void WebContentsDelegateQt::RenderFrameDeleted(content::RenderFrameHost *render_frame_host)
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index 77f6cc389..c6bf35c34 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -106,7 +106,7 @@ public:
     void AddNewContents(content::WebContents *source, std::unique_ptr<content::WebContents> new_contents, WindowOpenDisposition disposition, const gfx::Rect &initial_pos, bool user_gesture, bool *was_blocked) override;
     void CloseContents(content::WebContents *source) override;
     void LoadProgressChanged(content::WebContents* source, double progress) override;
-    void HandleKeyboardEvent(content::WebContents *source, const content::NativeWebKeyboardEvent &event) override;
+    bool HandleKeyboardEvent(content::WebContents *source, const content::NativeWebKeyboardEvent &event) override;
     content::ColorChooser* OpenColorChooser(content::WebContents *source, SkColor color, const std::vector<blink::mojom::ColorSuggestionPtr> &suggestions) override;
     void WebContentsCreated(content::WebContents *source_contents, int opener_render_process_id, int opener_render_frame_id,
                             const std::string &frame_name, const GURL &target_url, content::WebContents *new_contents) override;
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index e9a941bf2..01f28da2a 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -44,7 +44,7 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_impl.h"
 #include "base/run_loop.h"
 #include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
@@ -238,7 +238,7 @@ void WebEngineContext::destroy()
     destroyGpuProcess();
 
     base::MessagePump::Delegate *delegate =
-            static_cast<base::MessageLoop *>(m_runLoop->delegate_);
+            static_cast<base::MessageLoopImpl *>(m_runLoop->delegate_);
     // Flush the UI message loop before quitting.
     while (delegate->DoWork()) { }
 
@@ -392,7 +392,7 @@ WebEngineContext::WebEngineContext()
     QWebEngineUrlScheme::lockSchemes();
 
     // Allow us to inject javascript like any webview toolkit.
-    content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();
+    content::RenderFrameHost::AllowInjectingJavaScript();
 
     QStringList appArgs = QCoreApplication::arguments();
 
diff --git a/src/tools/qwebengine_convert_dict/main.cpp b/src/tools/qwebengine_convert_dict/main.cpp
index 9d3888ad6..1694dbcef 100644
--- a/src/tools/qwebengine_convert_dict/main.cpp
+++ b/src/tools/qwebengine_convert_dict/main.cpp
@@ -111,7 +111,9 @@ inline bool VerifyWords(const convert_dict::DicReader::WordList& org_words,
         base::span<const int> expectedAffixes(org_words[i].second);
         base::span<const int> actualAffixes(affix_ids, affix_matches);
 
-        if (expectedAffixes != actualAffixes) {
+        if (!std::equal(expectedAffixes.begin(), expectedAffixes.end(),
+                        actualAffixes.begin(), actualAffixes.end(),
+                        [](int a, int b) { return a == b; })) {
             out << "Affixes do not match!\n"
                 << "  Index:    " << i << "\n"
                 << "  Word:     " << QString::fromUtf8(buf) << "\n"
diff --git a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
index ced90655e..27edd66d8 100644
--- a/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
+++ b/src/tools/qwebengine_convert_dict/qwebengine_convert_dict.pro
@@ -39,6 +39,8 @@ SOURCES += \
 
 QMAKE_TARGET_DESCRIPTION = "Qt WebEngine Dictionary Converter"
 
+CONFIG += c++14
+
 # Support converting dictionaries in a prefix build, by supplying
 # the path to the ICU data file located in the Qt build path, rather
 # than the install path (which is not present at build time).