Adaptations for Chromium 84

Change-Id: I359805d0bea84147fca6de2e2c7b17b4dcb17bc7
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

40 files changed, 235 insertions, 255 deletions

diff --git a/src/core/accessibility_tree_formatter_qt.cpp b/src/core/accessibility_tree_formatter_qt.cpp
index 081856b37..df652c6ab 100644
--- a/src/core/accessibility_tree_formatter_qt.cpp
+++ b/src/core/accessibility_tree_formatter_qt.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "content/browser/accessibility/accessibility_tree_formatter_browser.h"
+#include "content/browser/accessibility/accessibility_tree_formatter_base.h"
 
 #include <utility>
 
@@ -53,18 +53,23 @@
 namespace content {
 
 #if QT_CONFIG(accessibility)
-class AccessibilityTreeFormatterQt : public AccessibilityTreeFormatterBrowser {
+class AccessibilityTreeFormatterQt : public AccessibilityTreeFormatterBase {
 public:
     explicit AccessibilityTreeFormatterQt();
     ~AccessibilityTreeFormatterQt() override;
 
+   std::unique_ptr<base::DictionaryValue> BuildAccessibilityTreeForProcess(base::ProcessId) override { return nullptr; }
+   std::unique_ptr<base::DictionaryValue> BuildAccessibilityTreeForWindow(gfx::AcceleratedWidget) override { return nullptr; }
+   std::unique_ptr<base::DictionaryValue> BuildAccessibilityTreeForPattern(const base::StringPiece &) override { return nullptr; }
+   std::unique_ptr<base::DictionaryValue> BuildAccessibilityTree(content::BrowserAccessibility *) override;
 private:
     base::FilePath::StringType GetExpectedFileSuffix() override;
     const std::string GetAllowEmptyString() override;
     const std::string GetAllowString() override;
     const std::string GetDenyString() override;
     const std::string GetDenyNodeString() override;
-    void AddProperties(const BrowserAccessibility &node, base::DictionaryValue* dict) override;
+    void RecursiveBuildAccessibilityTree(const content::BrowserAccessibility &node, base::DictionaryValue *dict) const;
+    void AddProperties(const BrowserAccessibility &node, base::DictionaryValue *dict) const;
     base::string16 ProcessTreeForOutput(const base::DictionaryValue &node, base::DictionaryValue * = nullptr) override;
 };
 
@@ -76,7 +81,30 @@ AccessibilityTreeFormatterQt::~AccessibilityTreeFormatterQt()
 {
 }
 
-void AccessibilityTreeFormatterQt::AddProperties(const BrowserAccessibility &node, base::DictionaryValue *dict)
+std::unique_ptr<base::DictionaryValue> AccessibilityTreeFormatterQt::BuildAccessibilityTree(content::BrowserAccessibility *root)
+{
+    std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
+    RecursiveBuildAccessibilityTree(*root, dict.get());
+    return dict;
+}
+
+void AccessibilityTreeFormatterQt::RecursiveBuildAccessibilityTree(const BrowserAccessibility &node, base::DictionaryValue *dict) const
+{
+    AddProperties(node, dict);
+
+    auto children = std::make_unique<base::ListValue>();
+    for (size_t i = 0; i < node.PlatformChildCount(); ++i) {
+        std::unique_ptr<base::DictionaryValue> child_dict(new base::DictionaryValue);
+
+        content::BrowserAccessibility *child_node = node.PlatformGetChild(i);
+
+        RecursiveBuildAccessibilityTree(*child_node, child_dict.get());
+        children->Append(std::move(child_dict));
+    }
+    dict->Set(kChildrenDictAttr, std::move(children));
+}
+
+void AccessibilityTreeFormatterQt::AddProperties(const BrowserAccessibility &node, base::DictionaryValue *dict) const
 {
     dict->SetInteger("id", node.GetId());
     const BrowserAccessibilityQt *acc_node = ToBrowserAccessibilityQt(&node);
diff --git a/src/core/browser_accessibility_manager_qt.cpp b/src/core/browser_accessibility_manager_qt.cpp
index 5968bfd30..1d635a6e9 100644
--- a/src/core/browser_accessibility_manager_qt.cpp
+++ b/src/core/browser_accessibility_manager_qt.cpp
@@ -48,13 +48,11 @@ namespace content {
 
 BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
       const ui::AXTreeUpdate& initialTree,
-      BrowserAccessibilityDelegate* delegate,
-      BrowserAccessibilityFactory* factory)
+      BrowserAccessibilityDelegate* delegate)
 {
 #if QT_CONFIG(accessibility)
-    return new BrowserAccessibilityManagerQt(nullptr, initialTree, delegate, factory);
+    return new BrowserAccessibilityManagerQt(nullptr, initialTree, delegate);
 #else
-    delete factory;
     return nullptr;
 #endif // QT_CONFIG(accessibility)
 }
@@ -71,8 +69,8 @@ BrowserAccessibility *BrowserAccessibility::Create()
 #if QT_CONFIG(accessibility)
 BrowserAccessibilityManagerQt::BrowserAccessibilityManagerQt(
     QObject *parentObject, const ui::AXTreeUpdate &initialTree,
-    BrowserAccessibilityDelegate* delegate, BrowserAccessibilityFactory* factory)
-      : BrowserAccessibilityManager(delegate, factory)
+    BrowserAccessibilityDelegate* delegate)
+      : BrowserAccessibilityManager(delegate)
       , m_parentObject(parentObject)
 {
     Initialize(initialTree);
diff --git a/src/core/browser_accessibility_manager_qt.h b/src/core/browser_accessibility_manager_qt.h
index 6d6086811..600ad673c 100644
--- a/src/core/browser_accessibility_manager_qt.h
+++ b/src/core/browser_accessibility_manager_qt.h
@@ -56,10 +56,9 @@ namespace content {
 class BrowserAccessibilityManagerQt : public BrowserAccessibilityManager
 {
 public:
-    BrowserAccessibilityManagerQt(QObject* parentObject,
-                                  const ui::AXTreeUpdate& initialTree,
-                                  BrowserAccessibilityDelegate* delegate,
-                                  BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
+    BrowserAccessibilityManagerQt(QObject *parentObject,
+                                  const ui::AXTreeUpdate &initialTree,
+                                  BrowserAccessibilityDelegate *delegate);
     ~BrowserAccessibilityManagerQt() override;
     void FireBlinkEvent(ax::mojom::Event event_type,
                         BrowserAccessibility* node) override;
diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp
index f4fe2f694..9b1901904 100644
--- a/src/core/browser_accessibility_qt.cpp
+++ b/src/core/browser_accessibility_qt.cpp
@@ -79,7 +79,7 @@ bool BrowserAccessibilityQt::isValid() const
 
 QObject *BrowserAccessibilityQt::object() const
 {
-    return 0;
+    return nullptr;
 }
 
 QAccessibleInterface *BrowserAccessibilityQt::childAt(int x, int y) const
@@ -90,7 +90,7 @@ QAccessibleInterface *BrowserAccessibilityQt::childAt(int x, int y) const
         if (childIface->rect().contains(x,y))
             return childIface;
     }
-    return 0;
+    return nullptr;
 }
 
 void *BrowserAccessibilityQt::interface_cast(QAccessible::InterfaceType type)
@@ -132,7 +132,7 @@ void *BrowserAccessibilityQt::interface_cast(QAccessible::InterfaceType type)
     default:
         break;
     }
-    return 0;
+    return nullptr;
 }
 
 QAccessibleInterface *BrowserAccessibilityQt::parent() const
@@ -209,6 +209,13 @@ QAccessible::Role BrowserAccessibilityQt::role() const
     case ax::mojom::Role::kUnknown:
         return QAccessible::NoRole;
 
+    // Internal roles (matching auralinux and win)
+    case ax::mojom::Role::kKeyboard:
+    case ax::mojom::Role::kIgnored:
+    case ax::mojom::Role::kImeCandidate:
+    case ax::mojom::Role::kPresentational:
+        return QAccessible::NoRole;
+
     // Used by Chromium to distinguish between the root of the tree
     // for this page, and a web area for a frame within this page.
     case ax::mojom::Role::kWebArea:
@@ -376,8 +383,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const
         return QAccessible::WebDocument;
     case ax::mojom::Role::kIframePresentational:
         return QAccessible::Grouping;
-    case ax::mojom::Role::kIgnored:
-        return QAccessible::NoRole;
     case ax::mojom::Role::kImage:
         return QAccessible::Graphic;
     case ax::mojom::Role::kImageMap:
@@ -386,8 +391,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const
         return QAccessible::StaticText;
     case ax::mojom::Role::kInputTime:
         return QAccessible::SpinBox;
-    case ax::mojom::Role::kKeyboard:
-        return QAccessible::NoRole; // FIXME
     case ax::mojom::Role::kLabelText:
         return QAccessible::StaticText;
     case ax::mojom::Role::kLayoutTable:
@@ -458,8 +461,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const
         return QAccessible::Button;
     case ax::mojom::Role::kPre:
         return QAccessible::Section;
-    case ax::mojom::Role::kPresentational:
-        return QAccessible::NoRole; // FIXME
     case ax::mojom::Role::kProgressIndicator:
         return QAccessible::ProgressBar;
     case ax::mojom::Role::kRadioButton:
@@ -646,16 +647,7 @@ QAccessible::State BrowserAccessibilityQt::state() const
     return state;
 }
 
-// Qt does not reference count accessibles
-void BrowserAccessibilityQt::NativeAddReference()
-{
-}
-
-// there is no reference counting, but BrowserAccessibility::Destroy
-// calls this (and that is the only place in the chromium sources,
-// so we can safely use it to dispose of ourselves here
-// (the default implementation of this function just contains a "delete this")
-void BrowserAccessibilityQt::NativeReleaseReference()
+void BrowserAccessibilityQt::Destroy()
 {
     // delete this
     QAccessible::Id interfaceId = QAccessible::uniqueId(this);
@@ -987,7 +979,7 @@ QAccessibleInterface *BrowserAccessibilityQt::table() const
     while (find_table && find_table->GetRole() != ax::mojom::Role::kTable)
         find_table = find_table->PlatformGetParent();
     if (!find_table)
-        return 0;
+        return nullptr;
     return static_cast<BrowserAccessibilityQt*>(find_table);
 }
 
diff --git a/src/core/browser_accessibility_qt.h b/src/core/browser_accessibility_qt.h
index 19c7a1e54..32a4fc76b 100644
--- a/src/core/browser_accessibility_qt.h
+++ b/src/core/browser_accessibility_qt.h
@@ -80,9 +80,7 @@ public:
     QAccessible::State state() const override;
 
     // BrowserAccessible
-    void NativeAddReference() override;
-    void NativeReleaseReference() override;
-    bool IsNative() const override { return true; }
+    void Destroy() override;
 
     // QAccessibleActionInterface
     QStringList actionNames() const override;
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
index 01937d3e7..6626b83b3 100644
--- a/src/core/chromium_overrides.cpp
+++ b/src/core/chromium_overrides.cpp
@@ -43,7 +43,6 @@
 
 #include "base/values.h"
 #include "content/browser/accessibility/accessibility_tree_formatter_blink.h"
-#include "content/browser/accessibility/accessibility_tree_formatter_browser.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/font_list.h"
@@ -195,7 +194,7 @@ void GrabViewSnapshotAsync(gfx::NativeView view,
 } // namespace ui
 #endif // defined(USE_AURA)
 
-std::unique_ptr<ui::OSExchangeData::Provider>
+std::unique_ptr<ui::OSExchangeDataProvider>
 ui::OSExchangeDataProviderFactory::CreateProvider() {
     return nullptr;
 }
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp
index a1dba8150..f47aa8b6c 100644
--- a/src/core/clipboard_qt.cpp
+++ b/src/core/clipboard_qt.cpp
@@ -201,10 +201,9 @@ void ClipboardQt::Clear(ui::ClipboardBuffer type)
                                                                               : QClipboard::Selection);
 }
 
-void ClipboardQt::ReadAvailableTypes(ui::ClipboardBuffer type, std::vector<base::string16> *types,
-                                     bool *contains_filenames) const
+void ClipboardQt::ReadAvailableTypes(ui::ClipboardBuffer type, std::vector<base::string16> *types) const
 {
-    if (!types || !contains_filenames) {
+    if (!types) {
         NOTREACHED();
         return;
     }
@@ -219,7 +218,6 @@ void ClipboardQt::ReadAvailableTypes(ui::ClipboardBuffer type, std::vector<base:
     const QStringList formats = mimeData->formats();
     for (const QString &mimeType : formats)
         types->push_back(toString16(mimeType));
-    *contains_filenames = false;
 
     const QByteArray customData = mimeData->data(QString::fromLatin1(ui::kMimeTypeWebCustomData));
     ui::ReadCustomDataTypes(customData.constData(), customData.size(), types);
diff --git a/src/core/clipboard_qt.h b/src/core/clipboard_qt.h
index cc1b95a32..79ffbb0b9 100644
--- a/src/core/clipboard_qt.h
+++ b/src/core/clipboard_qt.h
@@ -49,8 +49,7 @@ public:
     uint64_t GetSequenceNumber(ui::ClipboardBuffer type) const override;
     bool IsFormatAvailable(const ui::ClipboardFormatType &format, ui::ClipboardBuffer type) const override;
     void Clear(ui::ClipboardBuffer type) override;
-    void ReadAvailableTypes(ui::ClipboardBuffer type, std::vector<base::string16> *types,
-                            bool *contains_filenames) const override;
+    void ReadAvailableTypes(ui::ClipboardBuffer type, std::vector<base::string16> *types) const override;
     void ReadText(ui::ClipboardBuffer type, base::string16 *result) const override;
     void ReadAsciiText(ui::ClipboardBuffer type, std::string *result) const override;
     void ReadHTML(ui::ClipboardBuffer type, base::string16 *markup, std::string *src_url, uint32_t *fragment_start,
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index 9432fac7d..befce4e68 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -1,4 +1,3 @@
-
 qtConfig(webengine-printing-and-pdf) {
     gn_args += enable_basic_printing=true enable_print_preview=true
     gn_args += enable_pdf=true
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index d3181c555..a0d46a83a 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -607,23 +607,6 @@ private:
 
 WEB_CONTENTS_USER_DATA_KEY_IMPL(ServiceDriver)
 
-void ContentBrowserClientQt::InitFrameInterfaces()
-{
-    m_frameInterfaces = std::make_unique<service_manager::BinderRegistry>();
-    m_frameInterfacesParameterized = std::make_unique<service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>>();
-}
-
-void ContentBrowserClientQt::BindInterfaceRequestFromFrame(content::RenderFrameHost* render_frame_host,
-                                                           const std::string& interface_name,
-                                                           mojo::ScopedMessagePipeHandle interface_pipe)
-{
-    if (!m_frameInterfaces.get() && !m_frameInterfacesParameterized.get())
-        InitFrameInterfaces();
-
-    if (!m_frameInterfacesParameterized->TryBindInterface(interface_name, &interface_pipe, render_frame_host))
-        m_frameInterfaces->TryBindInterface(interface_name, &interface_pipe);
-}
-
 void ContentBrowserClientQt::BindHostReceiverForRenderer(content::RenderProcessHost *render_process_host,
                                                          mojo::GenericPendingReceiver receiver)
 {
@@ -643,41 +626,19 @@ static void BindNetworkHintsHandler(content::RenderFrameHost *frame_host,
 
 void ContentBrowserClientQt::RegisterBrowserInterfaceBindersForFrame(
         content::RenderFrameHost *render_frame_host,
-        service_manager::BinderMapWithContext<content::RenderFrameHost *> *map)
+        mojo::BinderMapWithContext<content::RenderFrameHost *> *map)
 {
     Q_UNUSED(render_frame_host);
     map->Add<blink::mojom::InsecureInputService>(base::BindRepeating(&ServiceDriver::BindInsecureInputService));
     map->Add<network_hints::mojom::NetworkHintsHandler>(base::BindRepeating(&BindNetworkHintsHandler));
 }
 
-namespace {
-void BindProcessNode(int render_process_host_id,
-                     mojo::PendingReceiver<performance_manager::mojom::ProcessCoordinationUnit> receiver)
-{
-    content::RenderProcessHost *render_process_host = content::RenderProcessHost::FromID(render_process_host_id);
-    if (!render_process_host)
-        return;
-
-    performance_manager::RenderProcessUserData *user_data =
-            performance_manager::RenderProcessUserData::GetForRenderProcessHost(render_process_host);
-
-    DCHECK(performance_manager::PerformanceManagerImpl::IsAvailable());
-    performance_manager::PerformanceManagerImpl::CallOnGraphImpl(
-                FROM_HERE, base::BindOnce(&performance_manager::ProcessNodeImpl::Bind,
-                                          base::Unretained(user_data->process_node()),
-                                          std::move(receiver)));
-}
-}  // namespace
-
 void ContentBrowserClientQt::ExposeInterfacesToRenderer(service_manager::BinderRegistry *registry,
                                                         blink::AssociatedInterfaceRegistry *associated_registry,
                                                         content::RenderProcessHost *render_process_host)
 {
     Q_UNUSED(associated_registry);
-    registry->AddInterface(base::BindRepeating(&BindProcessNode, render_process_host->GetID()),
-                           base::SequencedTaskRunnerHandle::Get());
-
-    performance_manager::PerformanceManagerRegistry::GetInstance()->CreateProcessNodeForRenderProcessHost(render_process_host);
+    performance_manager::PerformanceManagerRegistry::GetInstance()->CreateProcessNodeAndExposeInterfacesToRendererProcess(registry, render_process_host);
 }
 
 void ContentBrowserClientQt::RunServiceInstance(const service_manager::Identity &identity,
@@ -788,36 +749,41 @@ bool ContentBrowserClientQt::WillCreateRestrictedCookieManager(network::mojom::R
 
 bool ContentBrowserClientQt::AllowAppCache(const GURL &manifest_url,
                                            const GURL &first_party,
+                                           const base::Optional<url::Origin> &top_frame_origin,
                                            content::BrowserContext *context)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     return static_cast<ProfileQt *>(context)->profileAdapter()->cookieStore()->d_func()->canAccessCookies(toQt(first_party), toQt(manifest_url));
 }
 
-bool ContentBrowserClientQt::AllowServiceWorkerOnIO(const GURL &scope,
+content::AllowServiceWorkerResult
+ContentBrowserClientQt::AllowServiceWorkerOnIO(const GURL &scope,
                                                     const GURL &site_for_cookies,
                                                     const base::Optional<url::Origin> & /*top_frame_origin*/,
                                                     const GURL & /*script_url*/,
-                                                    content::ResourceContext *context,
-                                                    base::RepeatingCallback<content::WebContents*()> wc_getter)
+                                                    content::ResourceContext *context)
 {
     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.
-    return ProfileIODataQt::FromResourceContext(context)->canGetCookies(toQt(site_for_cookies), toQt(scope));
+    return ProfileIODataQt::FromResourceContext(context)->canGetCookies(toQt(site_for_cookies), toQt(scope))
+         ? content::AllowServiceWorkerResult::Yes()
+         : content::AllowServiceWorkerResult::No();
 }
 
-bool ContentBrowserClientQt::AllowServiceWorkerOnUI(const GURL &scope,
+content::AllowServiceWorkerResult
+ContentBrowserClientQt::AllowServiceWorkerOnUI(const GURL &scope,
                                                     const GURL &site_for_cookies,
                                                     const base::Optional<url::Origin> & /*top_frame_origin*/,
                                                     const GURL & /*script_url*/,
-                                                    content::BrowserContext *context,
-                                                    base::RepeatingCallback<content::WebContents*()> wc_getter)
+                                                    content::BrowserContext *context)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     // FIXME: Chrome also checks if javascript is enabled here to check if has been disabled since the service worker
     // was started.
-    return static_cast<ProfileQt *>(context)->profileAdapter()->cookieStore()->d_func()->canAccessCookies(toQt(site_for_cookies), toQt(scope));
+    return static_cast<ProfileQt *>(context)->profileAdapter()->cookieStore()->d_func()->canAccessCookies(toQt(site_for_cookies), toQt(scope))
+         ? content::AllowServiceWorkerResult::Yes()
+         : content::AllowServiceWorkerResult::No();
 }
 
 // We control worker access to FS and indexed-db using cookie permissions, this is mirroring Chromium's logic.
@@ -907,7 +873,8 @@ public:
                              const network::mojom::URLResponseHead &response_head,
                              bool *defer,
                              std::vector<std::string> *to_be_removed_headers,
-                             net::HttpRequestHeaders *modified_headers) override
+                             net::HttpRequestHeaders *modified_headers,
+                             net::HttpRequestHeaders *modified_cors_exempt_headers) override
     {
         TranslateUrl(&redirect_info->new_url);
     }
@@ -1109,22 +1076,19 @@ void ContentBrowserClientQt::OnNetworkServiceCreated(network::mojom::NetworkServ
     SystemNetworkContextManager::GetInstance()->OnNetworkServiceCreated(network_service);
 }
 
-mojo::Remote<network::mojom::NetworkContext> ContentBrowserClientQt::CreateNetworkContext(
+void ContentBrowserClientQt::ConfigureNetworkContextParams(
         content::BrowserContext *context,
         bool in_memory,
-        const base::FilePath &relative_partition_path)
+        const base::FilePath &relative_partition_path,
+        network::mojom::NetworkContextParams *network_context_params,
+        network::mojom::CertVerifierCreationParams *cert_verifier_creation_params)
 {
-    mojo::Remote<network::mojom::NetworkContext> network_context;
-    // ### do we need to pass in_memory and relative_partition_path to ProfileIODataQt::CreateNetworkContextParams() ?
-    network::mojom::NetworkContextParamsPtr context_params = ProfileIODataQt::FromBrowserContext(context)->CreateNetworkContextParams();
-    content::GetNetworkService()->CreateNetworkContext(
-            network_context.BindNewPipeAndPassReceiver(), std::move(context_params));
-
-    network::mojom::CookieManagerPtrInfo cookie_manager_info;
-    network_context->GetCookieManager(mojo::MakeRequest(&cookie_manager_info));
-    ProfileIODataQt::FromBrowserContext(context)->cookieDelegate()->setMojoCookieManager(std::move(cookie_manager_info));
+    ProfileIODataQt::FromBrowserContext(context)->ConfigureNetworkContextParams(in_memory, relative_partition_path,
+                                                                                network_context_params, cert_verifier_creation_params);
 
-    return network_context;
+    mojo::PendingRemote<network::mojom::CookieManager> cookie_manager_remote;
+    network_context_params->cookie_manager = cookie_manager_remote.InitWithNewPipeAndPassReceiver();
+    ProfileIODataQt::FromBrowserContext(context)->cookieDelegate()->setMojoCookieManager(std::move(cookie_manager_remote));
 }
 
 std::vector<base::FilePath> ContentBrowserClientQt::GetNetworkContextsParentDirectory()
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index fe6d8a076..a78787c5c 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -112,13 +112,10 @@ public:
     void GetAdditionalWebUISchemes(std::vector<std::string>* additional_schemes) override;
     void GetAdditionalAllowedSchemesForFileSystem(std::vector<std::string>* additional_schemes) override;
 
-    void BindInterfaceRequestFromFrame(content::RenderFrameHost* render_frame_host,
-                                       const std::string& interface_name,
-                                       mojo::ScopedMessagePipeHandle interface_pipe) override;
     void BindHostReceiverForRenderer(content::RenderProcessHost *render_process_host,
                                      mojo::GenericPendingReceiver receiver) override;
     void RegisterBrowserInterfaceBindersForFrame(content::RenderFrameHost *render_frame_host,
-                                                 service_manager::BinderMapWithContext<content::RenderFrameHost *> *map) override;
+                                                 mojo::BinderMapWithContext<content::RenderFrameHost *> *map) override;
     void RunServiceInstance(const service_manager::Identity &identity,
                             mojo::PendingReceiver<service_manager::mojom::Service> *receiver) override;
     void ExposeInterfacesToRenderer(service_manager::BinderRegistry *registry,
@@ -155,21 +152,20 @@ public:
 
     bool AllowAppCache(const GURL &manifest_url,
                        const GURL &first_party,
+                       const base::Optional<url::Origin> &top_frame_origin,
                        content::BrowserContext *context) override;
-
-    bool AllowServiceWorkerOnIO(const GURL &scope,
-                                const GURL &site_for_cookies,
-                                const base::Optional<url::Origin> &top_frame_origin,
-                                const GURL &script_url,
-                                content::ResourceContext *context,
-                                base::RepeatingCallback<content::WebContents*()> wc_getter) override;
-
-    bool AllowServiceWorkerOnUI(const GURL &scope,
-                                const GURL &site_for_cookies,
-                                const base::Optional<url::Origin> &top_frame_origin,
-                                const GURL &script_url,
-                                content::BrowserContext *context,
-                                base::RepeatingCallback<content::WebContents*()> wc_getter) override;
+    content::AllowServiceWorkerResult AllowServiceWorkerOnIO(
+            const GURL &scope,
+            const GURL &site_for_cookies,
+            const base::Optional<url::Origin> &top_frame_origin,
+            const GURL &script_url,
+            content::ResourceContext *context) override;
+    content::AllowServiceWorkerResult AllowServiceWorkerOnUI(
+            const GURL &scope,
+            const GURL &site_for_cookies,
+            const base::Optional<url::Origin> &top_frame_origin,
+            const GURL &script_url,
+            content::BrowserContext *context) override;
 
     void AllowWorkerFileSystem(const GURL &url,
                                content::BrowserContext *context,
@@ -247,9 +243,12 @@ public:
     scoped_refptr<network::SharedURLLoaderFactory> GetSystemSharedURLLoaderFactory() override;
     network::mojom::NetworkContext *GetSystemNetworkContext() override;
     void OnNetworkServiceCreated(network::mojom::NetworkService *network_service) override;
-    mojo::Remote<network::mojom::NetworkContext> CreateNetworkContext(content::BrowserContext *context,
-                                                                      bool in_memory,
-                                                                      const base::FilePath &relative_partition_path) override;
+    void ConfigureNetworkContextParams(content::BrowserContext *context,
+                                       bool in_memory,
+                                       const base::FilePath &relative_partition_path,
+                                       network::mojom::NetworkContextParams *network_context_params,
+                                       network::mojom::CertVerifierCreationParams *cert_verifier_creation_params) override;
+
     std::vector<base::FilePath> GetNetworkContextsParentDirectory() override;
     void RegisterNonNetworkNavigationURLLoaderFactories(int frame_tree_node_id, NonNetworkURLLoaderFactoryMap *factories) override;
     void RegisterNonNetworkSubresourceURLLoaderFactories(int render_process_id, int render_frame_id,
@@ -263,11 +262,7 @@ public:
     std::string GetProduct() override;
 
 private:
-    void InitFrameInterfaces();
-
     scoped_refptr<ShareGroupQtQuick> m_shareGroupQtQuick;
-    std::unique_ptr<service_manager::BinderRegistry> m_frameInterfaces;
-    std::unique_ptr<service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>> m_frameInterfacesParameterized;
 };
 
 } // namespace QtWebEngineCore
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 647d45819..136fab596 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -422,8 +422,7 @@ void ContentClientQt::AddContentDecryptionModules(std::vector<content::CdmInfo>
             content::CdmCapability capability(
                 {}, {media::EncryptionScheme::kCenc, media::EncryptionScheme::kCbcs},
                 {media::CdmSessionType::kTemporary,
-                 media::CdmSessionType::kPersistentLicense},
-                {});
+                 media::CdmSessionType::kPersistentLicense});
 
             // Register kExternalClearKeyDifferentGuidTestKeySystem first separately.
             // Otherwise, it'll be treated as a sub-key-system of normal
diff --git a/src/core/desktop_screen_qt.cpp b/src/core/desktop_screen_qt.cpp
index 15a3856fc..a6734231f 100644
--- a/src/core/desktop_screen_qt.cpp
+++ b/src/core/desktop_screen_qt.cpp
@@ -100,14 +100,22 @@ display::Display DesktopScreenQt::GetPrimaryDisplay() const
     return display::Display(0);
 }
 
-void DesktopScreenQt::AddObserver(display::DisplayObserver* observer)
+void DesktopScreenQt::AddObserver(display::DisplayObserver *observer)
 {
-    Q_UNREACHABLE();
+    m_observers.insert(observer);
 }
 
-void DesktopScreenQt::RemoveObserver(display::DisplayObserver* observer)
+void DesktopScreenQt::RemoveObserver(display::DisplayObserver *observer)
+{
+    m_observers.erase(observer);
+}
+
+gfx::NativeWindow DesktopScreenQt::GetLocalProcessWindowAtPoint(
+        const gfx::Point &point,
+        const std::set<gfx::NativeWindow> &ignore)
 {
     Q_UNREACHABLE();
+    return gfx::NativeWindow();
 }
 
 } // namespace QtWebEngineCore
diff --git a/src/core/desktop_screen_qt.h b/src/core/desktop_screen_qt.h
index 0c52c615a..f6b252789 100644
--- a/src/core/desktop_screen_qt.h
+++ b/src/core/desktop_screen_qt.h
@@ -42,9 +42,12 @@
 
 #include "ui/display/screen.h"
 
+#include <set>
+
 namespace QtWebEngineCore {
 
-class DesktopScreenQt : public display::Screen {
+class DesktopScreenQt : public display::Screen
+{
 public:
     // Overridden from gfx::Screen:
     gfx::Point GetCursorScreenPoint() override;
@@ -58,6 +61,11 @@ public:
     display::Display GetPrimaryDisplay() const override;
     void AddObserver(display::DisplayObserver* observer) override;
     void RemoveObserver(display::DisplayObserver* observer) override;
+
+    gfx::NativeWindow GetLocalProcessWindowAtPoint(const gfx::Point &point,
+                                                   const std::set<gfx::NativeWindow> &ignore) override;
+private:
+    std::set<display::DisplayObserver *> m_observers;
 };
 
 } // namespace QtWebEngineCore
diff --git a/src/core/extensions/extension_system_qt.h b/src/core/extensions/extension_system_qt.h
index e3762e8a6..5c84a0eb3 100644
--- a/src/core/extensions/extension_system_qt.h
+++ b/src/core/extensions/extension_system_qt.h
@@ -121,6 +121,8 @@ public:
 
     const base::OneShotEvent &ready() const override { return ready_; }
 
+    void PerformActionBasedOnOmahaAttributes(const std::string &, const base::Value &) override { /* fixme? */}
+
 private:
     void OnExtensionRegisteredWithRequestContexts(scoped_refptr<const extensions::Extension> extension);
 
diff --git a/src/core/extensions/extensions_browser_client_qt.cpp b/src/core/extensions/extensions_browser_client_qt.cpp
index b285aadd8..1f714a42e 100644
--- a/src/core/extensions/extensions_browser_client_qt.cpp
+++ b/src/core/extensions/extensions_browser_client_qt.cpp
@@ -156,7 +156,9 @@ public:
 
     // mojom::URLLoader implementation:
     void FollowRedirect(const std::vector<std::string> &removed_headers,
-                        const net::HttpRequestHeaders &modified_headers, const base::Optional<GURL> &new_url) override
+                        const net::HttpRequestHeaders &modified_headers,
+                        const net::HttpRequestHeaders &modified_cors_exempt_headers,
+                        const base::Optional<GURL> &new_url) override
     {
         NOTREACHED() << "No redirects for local file loads.";
     }
@@ -210,11 +212,10 @@ private:
             return;
         }
         head->headers = response_headers_;
-        head->headers->AddHeader(base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentLength,
-                                                   base::NumberToString(head->content_length).c_str()));
+        head->headers->AddHeader(net::HttpRequestHeaders::kContentLength,
+                                 base::NumberToString(head->content_length).c_str());
         if (!head->mime_type.empty()) {
-            head->headers->AddHeader(
-                    base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentType, head->mime_type.c_str()));
+            head->headers->AddHeader(net::HttpRequestHeaders::kContentType, head->mime_type.c_str());
         }
         client_->OnReceiveResponse(std::move(head));
         client_->OnStartLoadingResponseBody(std::move(pipe.consumer_handle));
@@ -448,7 +449,7 @@ ExtensionSystemProvider *ExtensionsBrowserClientQt::GetExtensionSystemFactory()
 }
 
 void ExtensionsBrowserClientQt::RegisterBrowserInterfaceBindersForFrame(
-        service_manager::BinderMapWithContext<content::RenderFrameHost*> *binder_map,
+        mojo::BinderMapWithContext<content::RenderFrameHost*> *binder_map,
         content::RenderFrameHost* render_frame_host,
         const Extension* extension) const
 {
diff --git a/src/core/extensions/extensions_browser_client_qt.h b/src/core/extensions/extensions_browser_client_qt.h
index b7f944635..5889694b7 100644
--- a/src/core/extensions/extensions_browser_client_qt.h
+++ b/src/core/extensions/extensions_browser_client_qt.h
@@ -93,8 +93,9 @@ public:
     bool IsRunningInForcedAppMode() override;
     bool IsLoggedInAsPublicAccount() override;
     ExtensionSystemProvider *GetExtensionSystemFactory() override;
-    void RegisterBrowserInterfaceBindersForFrame(service_manager::BinderMapWithContext<content::RenderFrameHost*> *,
+    void RegisterBrowserInterfaceBindersForFrame(mojo::BinderMapWithContext<content::RenderFrameHost*> *,
                                                  content::RenderFrameHost *, const extensions::Extension *) const override;
+
     std::unique_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(content::BrowserContext *context) const override;
     const ComponentExtensionResourceManager *
     GetComponentExtensionResourceManager() override;
diff --git a/src/core/net/cookie_monster_delegate_qt.cpp b/src/core/net/cookie_monster_delegate_qt.cpp
index a7a3a9348..a55a9e8bb 100644
--- a/src/core/net/cookie_monster_delegate_qt.cpp
+++ b/src/core/net/cookie_monster_delegate_qt.cpp
@@ -151,7 +151,7 @@ void CookieMonsterDelegateQt::setCookie(quint64 callbackId, const QNetworkCookie
     }
     net::CookieOptions options;
     options.set_include_httponly();
-    m_mojoCookieManager->SetCanonicalCookie(*canonCookie.get(), gurl.scheme(), options, std::move(callback));
+    m_mojoCookieManager->SetCanonicalCookie(*canonCookie.get(), gurl, options, std::move(callback));
 }
 
 void CookieMonsterDelegateQt::deleteCookie(const QNetworkCookie &cookie, const QUrl &origin)
diff --git a/src/core/net/custom_url_loader_factory.cpp b/src/core/net/custom_url_loader_factory.cpp
index 709e4451b..26436f36a 100644
--- a/src/core/net/custom_url_loader_factory.cpp
+++ b/src/core/net/custom_url_loader_factory.cpp
@@ -91,6 +91,7 @@ public:
     // network::mojom::URLLoader:
     void FollowRedirect(const std::vector<std::string> &removed_headers,
                         const net::HttpRequestHeaders &modified_headers,
+                        const net::HttpRequestHeaders &modified_cors_exempt_headers, // FIXME: do something with this?
                         const base::Optional<GURL> &new_url) override
     {
         // We can be asked for follow our own redirect
diff --git a/src/core/net/proxying_url_loader_factory_qt.cpp b/src/core/net/proxying_url_loader_factory_qt.cpp
index 7b478c12a..f63e78861 100644
--- a/src/core/net/proxying_url_loader_factory_qt.cpp
+++ b/src/core/net/proxying_url_loader_factory_qt.cpp
@@ -137,7 +137,9 @@ public:
 
     // network::mojom::URLLoader
     void FollowRedirect(const std::vector<std::string> &removed_headers,
-                        const net::HttpRequestHeaders &modified_headers, const base::Optional<GURL> &new_url) override;
+                        const net::HttpRequestHeaders &modified_headers,
+                        const net::HttpRequestHeaders &modified_cors_exempt_headers,
+                        const base::Optional<GURL> &new_url) override;
     void SetPriority(net::RequestPriority priority, int32_t intra_priority_value) override;
     void PauseReadingBodyFromNet() override;
     void ResumeReadingBodyFromNet() override;
@@ -390,10 +392,11 @@ void InterceptedRequest::OnComplete(const network::URLLoaderCompletionStatus &st
 
 void InterceptedRequest::FollowRedirect(const std::vector<std::string> &removed_headers,
                                         const net::HttpRequestHeaders &modified_headers,
+                                        const net::HttpRequestHeaders &modified_cors_exempt_headers,
                                         const base::Optional<GURL> &new_url)
 {
     if (target_loader_)
-        target_loader_->FollowRedirect(removed_headers, modified_headers, new_url);
+        target_loader_->FollowRedirect(removed_headers, modified_headers, modified_cors_exempt_headers, new_url);
 
     // If |OnURLLoaderClientError| was called then we're just waiting for the
     // connection error handler of |proxied_loader_binding_|. Don't restart the
diff --git a/src/core/net/system_network_context_manager.cpp b/src/core/net/system_network_context_manager.cpp
index 611b5eafa..d4681bf7a 100644
--- a/src/core/net/system_network_context_manager.cpp
+++ b/src/core/net/system_network_context_manager.cpp
@@ -263,41 +263,23 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(network::mo
     network_context_params->initial_ssl_config->symantec_enforcement_disabled = true;
 }
 
-network::mojom::NetworkContextParamsPtr SystemNetworkContextManager::CreateDefaultNetworkContextParams()
+void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(network::mojom::NetworkContextParams *network_context_params)
 {
-    network::mojom::NetworkContextParamsPtr network_context_params = network::mojom::NetworkContextParams::New();
-    content::UpdateCorsExemptHeader(network_context_params.get());
+    content::UpdateCorsExemptHeader(network_context_params);
 
     network_context_params->enable_brotli = true;
 
-    //    network_context_params->user_agent = GetUserAgent();
-
     // Disable referrers by default. Any consumer that enables referrers should
     // respect prefs::kEnableReferrers from the appropriate pref store.
     network_context_params->enable_referrers = false;
 
-    //  const base::CommandLine& command_line =
-    //      *base::CommandLine::ForCurrentProcess();
-
-    //  // TODO(eroman): Figure out why this doesn't work in single-process mode,
-    //  // or if it does work, now.
-    //  // Should be possible now that a private isolate is used.
-    //  // http://crbug.com/474654
-    //  if (!command_line.HasSwitch(switches::kWinHttpProxyResolver)) {
-    //    if (command_line.HasSwitch(switches::kSingleProcess)) {
-    //      LOG(ERROR) << "Cannot use V8 Proxy resolver in single process mode.";
-    //    } else {
     network_context_params->proxy_resolver_factory = ChromeMojoProxyResolverFactory::CreateWithSelfOwnedReceiver();
-    //    }
-    //  }
-
-    //    network_context_params->pac_quick_check_enabled = local_state_->GetBoolean(prefs::kQuickCheckEnabled);
 
     // Use the SystemNetworkContextManager to populate and update SSL
     // configuration. The SystemNetworkContextManager is owned by the
     // BrowserProcess itself, so will only be destroyed on shutdown, at which
     // point, all NetworkContexts will be destroyed as well.
-    AddSSLConfigToNetworkContextParams(network_context_params.get());
+    AddSSLConfigToNetworkContextParams(network_context_params);
 
     // CT is only enabled on Desktop platforms for now.
     network_context_params->enforce_chrome_ct_policy = true;
@@ -308,14 +290,13 @@ network::mojom::NetworkContextParamsPtr SystemNetworkContextManager::CreateDefau
         log_info->name = ct_log.log_name;
         network_context_params->ct_logs.push_back(std::move(log_info));
     }
-
-    return network_context_params;
 }
 
 network::mojom::NetworkContextParamsPtr SystemNetworkContextManager::CreateNetworkContextParams()
 {
     // TODO(mmenke): Set up parameters here (in memory cookie store, etc).
-    network::mojom::NetworkContextParamsPtr network_context_params = CreateDefaultNetworkContextParams();
+    network::mojom::NetworkContextParamsPtr network_context_params = network::mojom::NetworkContextParams::New();
+    ConfigureDefaultNetworkContextParams(network_context_params.get());
 
     network_context_params->context_name = std::string("system");
 
diff --git a/src/core/net/system_network_context_manager.h b/src/core/net/system_network_context_manager.h
index 0dd503ce1..bd12fe217 100644
--- a/src/core/net/system_network_context_manager.h
+++ b/src/core/net/system_network_context_manager.h
@@ -130,8 +130,8 @@ public:
     // SSL configuration updates.
     void AddSSLConfigToNetworkContextParams(network::mojom::NetworkContextParams *network_context_params);
 
-    // Returns default set of parameters for configuring the network service.
-    network::mojom::NetworkContextParamsPtr CreateDefaultNetworkContextParams();
+    // Configures the default set of parameters for the network context.
+    void ConfigureDefaultNetworkContextParams(network::mojom::NetworkContextParams *);
 
 private:
     class URLLoaderFactoryForSystem;
diff --git a/src/core/ozone/gl_surface_egl_qt.cpp b/src/core/ozone/gl_surface_egl_qt.cpp
index 8e8e66f63..4a168ce3c 100644
--- a/src/core/ozone/gl_surface_egl_qt.cpp
+++ b/src/core/ozone/gl_surface_egl_qt.cpp
@@ -181,6 +181,11 @@ bool GLSurfaceEGL::IsANGLEFeatureControlSupported()
     return false;
 }
 
+bool GLSurfaceEGL::IsANGLEPowerPreferenceSupported()
+{
+    return false;
+}
+
 void GLSurfaceEGL::ShutdownOneOff()
 {
 }
diff --git a/src/core/printing/print_view_manager_base_qt.cpp b/src/core/printing/print_view_manager_base_qt.cpp
index a6c478037..962dce269 100644
--- a/src/core/printing/print_view_manager_base_qt.cpp
+++ b/src/core/printing/print_view_manager_base_qt.cpp
@@ -130,7 +130,7 @@ void PrintViewManagerBaseQt::PrintDocument(printing::PrintedDocument *document,
     CHECK(metafile->InitFromData(*print_data));
 
     // Update the rendered document. It will send notifications to the listener.
-    document->SetDocument(std::move(metafile), page_size, content_area);
+    document->SetDocument(std::move(metafile));
     ShouldQuitFromInnerMessageLoop();
 }
 
diff --git a/src/core/printing/print_view_manager_qt.cpp b/src/core/printing/print_view_manager_qt.cpp
index df7fcc0fc..e6c435ab4 100644
--- a/src/core/printing/print_view_manager_qt.cpp
+++ b/src/core/printing/print_view_manager_qt.cpp
@@ -121,12 +121,12 @@ static base::DictionaryValue *createPrintSettings()
     printSettings->SetInteger(printing::kPreviewRequestID, internalRequestId);
 
     // The following are standard settings that Chromium expects to be set.
-    printSettings->SetInteger(printing::kSettingPrinterType, printing::kPdfPrinter);
+    printSettings->SetInteger(printing::kSettingPrinterType, static_cast<int>(printing::PrinterType::kPdf));
 
     printSettings->SetInteger(printing::kSettingDpiHorizontal, printing::kPointsPerInch);
     printSettings->SetInteger(printing::kSettingDpiVertical, printing::kPointsPerInch);
 
-    printSettings->SetInteger(printing::kSettingDuplexMode, printing::SIMPLEX);
+    printSettings->SetInteger(printing::kSettingDuplexMode, static_cast<int>(printing::mojom::DuplexMode::kSimplex));
     printSettings->SetInteger(printing::kSettingCopies, 1);
     printSettings->SetInteger(printing::kSettingPagesPerSheet, 1);
     printSettings->SetBoolean(printing::kSettingCollate, false);
diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp
index b0b48af03..81c4f9809 100644
--- a/src/core/profile_adapter.cpp
+++ b/src/core/profile_adapter.cpp
@@ -99,7 +99,6 @@ ProfileAdapter::ProfileAdapter(const QString &storageName):
     WebEngineContext::current()->addProfileAdapter(this);
     // creation of profile requires webengine context
     m_profile.reset(new ProfileQt(this));
-    content::BrowserContext::Initialize(m_profile.data(), toFilePath(dataPath()));
     // fixme: this should not be here
     m_profile->m_profileIOData->initializeOnUIThread();
     m_customUrlSchemeHandlers.insert(QByteArrayLiteral("qrc"), &m_qrcHandler);
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp
index 91adbc57d..5d8c16523 100644
--- a/src/core/profile_io_data_qt.cpp
+++ b/src/core/profile_io_data_qt.cpp
@@ -216,12 +216,14 @@ std::unique_ptr<net::ClientCertStore> ProfileIODataQt::CreateClientCertStore()
 #endif
 }
 
-network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextParams()
+void ProfileIODataQt::ConfigureNetworkContextParams(bool in_memory,
+                                                    const base::FilePath &relative_partition_path,
+                                                    network::mojom::NetworkContextParams *network_context_params,
+                                                    network::mojom::CertVerifierCreationParams *cert_verifier_creation_params)
 {
     setFullConfiguration();
 
-    network::mojom::NetworkContextParamsPtr network_context_params =
-             SystemNetworkContextManager::GetInstance()->CreateDefaultNetworkContextParams();
+    SystemNetworkContextManager::GetInstance()->ConfigureDefaultNetworkContextParams(network_context_params);
 
     network_context_params->context_name = m_storageName.toStdString();
     network_context_params->user_agent = m_httpUserAgent.toStdString();
@@ -233,10 +235,10 @@ network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextPar
 
     network_context_params->http_cache_enabled = m_httpCacheType != ProfileAdapter::NoCache;
     network_context_params->http_cache_max_size = m_httpCacheMaxSize;
-    if (m_httpCacheType == ProfileAdapter::DiskHttpCache && !m_httpCachePath.isEmpty())
+    if (m_httpCacheType == ProfileAdapter::DiskHttpCache && !m_httpCachePath.isEmpty() && !m_inMemoryOnly && !in_memory)
         network_context_params->http_cache_path = toFilePath(m_httpCachePath);
 
-    if (m_persistentCookiesPolicy != ProfileAdapter::NoPersistentCookies && !m_inMemoryOnly) {
+    if (m_persistentCookiesPolicy != ProfileAdapter::NoPersistentCookies && !m_inMemoryOnly && !in_memory) {
         base::FilePath cookie_path = toFilePath(m_dataPath);
         cookie_path = cookie_path.AppendASCII("Cookies");
         network_context_params->cookie_path = cookie_path;
@@ -244,7 +246,7 @@ network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextPar
         network_context_params->restore_old_session_cookies = m_persistentCookiesPolicy == ProfileAdapter::ForcePersistentCookies;
         network_context_params->persist_session_cookies = m_persistentCookiesPolicy != ProfileAdapter::NoPersistentCookies;
     }
-    if (!m_inMemoryOnly) {
+    if (!m_inMemoryOnly && !in_memory) {
         network_context_params->http_server_properties_path = toFilePath(m_dataPath).AppendASCII("Network Persistent State");
         network_context_params->transport_security_persister_path = toFilePath(m_dataPath);
     }
@@ -253,8 +255,6 @@ network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextPar
     network_context_params->enable_ftp_url_support = true;
 #endif  // !BUILDFLAG(DISABLE_FTP_SUPPORT)
 
-//    network_context_params->enable_certificate_reporting = true;
-//    network_context_params->enable_expect_ct_reporting = true;
     network_context_params->enforce_chrome_ct_policy = false;
     network_context_params->primary_network_context = m_useForGlobalCertificateVerification;
 
@@ -262,9 +262,7 @@ network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextPar
     network_context_params->cors_origin_access_list =
         m_profile->GetSharedCorsOriginAccessList()->GetOriginAccessList().CreateCorsOriginAccessPatternsList();
 
-    m_proxyConfigMonitor->AddToNetworkContextParams(network_context_params.get());
-
-    return network_context_params;
+    m_proxyConfigMonitor->AddToNetworkContextParams(network_context_params);
 }
 
 // static
diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h
index 00d2c392c..f2dab6dd1 100644
--- a/src/core/profile_io_data_qt.h
+++ b/src/core/profile_io_data_qt.h
@@ -103,7 +103,10 @@ public:
     void clearHttpCache(); // runs on ui thread
     bool isClearHttpCacheInProgress() { return m_clearHttpCacheInProgress; }
 
-    network::mojom::NetworkContextParamsPtr CreateNetworkContextParams();
+    void ConfigureNetworkContextParams(bool in_memory,
+                                       const base::FilePath &relative_partition_path,
+                                       network::mojom::NetworkContextParams *network_context_params,
+                                       network::mojom::CertVerifierCreationParams *cert_verifier_creation_params);
 
 #if QT_CONFIG(ssl)
     ClientCertificateStoreData *clientCertificateStoreData();
diff --git a/src/core/qtwebengine.gni b/src/core/qtwebengine.gni
index 9afdc0e76..11352a3e8 100644
--- a/src/core/qtwebengine.gni
+++ b/src/core/qtwebengine.gni
@@ -31,7 +31,7 @@ deps = [
   "//components/spellcheck:buildflags",
   "//components/proxy_config",
   "//components/user_prefs",
-  "//content/public/app:browser",
+  "//content/public/app",
   "//content",
   "//media:media_buildflags",
   "//net",
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 0f53228c7..3610dd96e 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -936,16 +936,16 @@ void RenderWidgetHostViewQt::OnGestureEvent(const ui::GestureEventData& gesture)
 
     if (m_touchSelectionController && m_touchSelectionControllerClient) {
         switch (event.GetType()) {
-        case blink::WebInputEvent::kGestureLongPress:
+        case blink::WebInputEvent::Type::kGestureLongPress:
             m_touchSelectionController->HandleLongPressEvent(event.TimeStamp(), event.PositionInWidget());
             break;
-        case blink::WebInputEvent::kGestureTap:
+        case blink::WebInputEvent::Type::kGestureTap:
             m_touchSelectionController->HandleTapEvent(event.PositionInWidget(), event.data.tap.tap_count);
             break;
-        case blink::WebInputEvent::kGestureScrollBegin:
+        case blink::WebInputEvent::Type::kGestureScrollBegin:
             m_touchSelectionControllerClient->onScrollBegin();
             break;
-        case blink::WebInputEvent::kGestureScrollEnd:
+        case blink::WebInputEvent::Type::kGestureScrollEnd:
             m_touchSelectionControllerClient->onScrollEnd();
             break;
         default:
@@ -1231,9 +1231,10 @@ void RenderWidgetHostViewQt::closePopup()
     host()->LostFocus();
 }
 
-void RenderWidgetHostViewQt::ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) {
+void RenderWidgetHostViewQt::ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, blink::mojom::InputEventResultState ack_result)
+{
     Q_UNUSED(touch);
-    const bool eventConsumed = ack_result == content::INPUT_EVENT_ACK_STATE_CONSUMED;
+    const bool eventConsumed = ack_result == blink::mojom::InputEventResultState::kConsumed;
     const bool isSetNonBlocking = content::InputEventAckStateIsSetNonBlocking(ack_result);
     m_gestureProvider.OnTouchEventAck(touch.event.unique_touch_event_id, eventConsumed, isSetNonBlocking);
 }
@@ -1329,17 +1330,17 @@ void RenderWidgetHostViewQt::handleKeyEvent(QKeyEvent *ev)
         return;
 
     content::NativeWebKeyboardEvent webEvent = WebEventFactory::toWebKeyboardEvent(ev);
-    if (webEvent.GetType() == blink::WebInputEvent::kRawKeyDown && !m_editCommand.empty()) {
+    if (webEvent.GetType() == blink::WebInputEvent::Type::kRawKeyDown && !m_editCommand.empty()) {
         ui::LatencyInfo latency;
         latency.set_source_event_type(ui::SourceEventType::KEY_PRESS);
-        content::EditCommands commands;
-        commands.emplace_back(m_editCommand, "");
+        std::vector<blink::mojom::EditCommandPtr> commands;
+        commands.emplace_back(blink::mojom::EditCommand::New(m_editCommand, ""));
         m_editCommand.clear();
-        host()->ForwardKeyboardEventWithCommands(webEvent, latency, &commands, nullptr);
+        host()->ForwardKeyboardEventWithCommands(webEvent, latency, std::move(commands), nullptr);
         return;
     }
 
-    bool keyDownTextInsertion = webEvent.GetType() == blink::WebInputEvent::kRawKeyDown && webEvent.text[0];
+    bool keyDownTextInsertion = webEvent.GetType() == blink::WebInputEvent::Type::kRawKeyDown && webEvent.text[0];
     webEvent.skip_in_browser = keyDownTextInsertion;
     host()->ForwardKeyboardEvent(webEvent);
 
@@ -1348,7 +1349,7 @@ void RenderWidgetHostViewQt::handleKeyEvent(QKeyEvent *ev)
         // The RawKeyDown is skipped on the way back (see above).
         // The same os_event will be set on both NativeWebKeyboardEvents.
         webEvent.skip_in_browser = false;
-        webEvent.SetType(blink::WebInputEvent::kChar);
+        webEvent.SetType(blink::WebInputEvent::Type::kChar);
         host()->ForwardKeyboardEvent(webEvent);
     }
 }
@@ -1530,7 +1531,7 @@ void RenderWidgetHostViewQt::handleWheelEvent(QWheelEvent *ev)
     m_pendingWheelEvents.append(WebEventFactory::toWebWheelEvent(ev));
 }
 
-void RenderWidgetHostViewQt::WheelEventAck(const blink::WebMouseWheelEvent &event, content::InputEventAckState /*ack_result*/)
+void RenderWidgetHostViewQt::WheelEventAck(const blink::WebMouseWheelEvent &event, blink::mojom::InputEventResultState /*ack_result*/)
 {
     if (event.phase == blink::WebMouseWheelEvent::kPhaseEnded)
         return;
@@ -1544,14 +1545,14 @@ void RenderWidgetHostViewQt::WheelEventAck(const blink::WebMouseWheelEvent &even
     }
 }
 
-void RenderWidgetHostViewQt::GestureEventAck(const blink::WebGestureEvent &event, content::InputEventAckState ack_result)
+void RenderWidgetHostViewQt::GestureEventAck(const blink::WebGestureEvent &event, blink::mojom::InputEventResultState ack_result)
 {
     // Forward unhandled scroll events back as wheel events
-    if (event.GetType() != blink::WebInputEvent::kGestureScrollUpdate)
+    if (event.GetType() != blink::WebInputEvent::Type::kGestureScrollUpdate)
         return;
     switch (ack_result) {
-    case content::INPUT_EVENT_ACK_STATE_NOT_CONSUMED:
-    case content::INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS:
+    case blink::mojom::InputEventResultState::kNotConsumed:
+    case blink::mojom::InputEventResultState::kNoConsumerExists:
         WebEventFactory::sendUnhandledWheelEvent(event, delegate());
         break;
     default:
@@ -1755,14 +1756,14 @@ void RenderWidgetHostViewQt::handlePointerEvent(T *event)
     // Currently WebMouseEvent is a subclass of WebPointerProperties, so basically
     // tablet events are mouse events with extra properties.
     blink::WebMouseEvent webEvent = WebEventFactory::toWebMouseEvent(event);
-    if ((webEvent.GetType() == blink::WebInputEvent::kMouseDown || webEvent.GetType() == blink::WebInputEvent::kMouseUp)
+    if ((webEvent.GetType() == blink::WebInputEvent::Type::kMouseDown || webEvent.GetType() == blink::WebInputEvent::Type::kMouseUp)
             && webEvent.button == blink::WebMouseEvent::Button::kNoButton) {
         // Blink can only handle the 5 main mouse-buttons and may assert when processing mouse-down for no button.
         LOG(INFO) << "Unhandled mouse button";
         return;
     }
 
-    if (webEvent.GetType() == blink::WebInputEvent::kMouseDown) {
+    if (webEvent.GetType() == blink::WebInputEvent::Type::kMouseDown) {
         if (event->button() != m_clickHelper.lastPressButton
             || (event->timestamp() - m_clickHelper.lastPressTimestamp > static_cast<ulong>(qGuiApp->styleHints()->mouseDoubleClickInterval()))
             || (event->pos() - m_clickHelper.lastPressPosition).manhattanLength() > qGuiApp->styleHints()->startDragDistance()
@@ -1775,7 +1776,7 @@ void RenderWidgetHostViewQt::handlePointerEvent(T *event)
         m_clickHelper.lastPressPosition = QPointF(event->pos()).toPoint();
     }
 
-    if (webEvent.GetType() == blink::WebInputEvent::kMouseUp)
+    if (webEvent.GetType() == blink::WebInputEvent::Type::kMouseUp)
         webEvent.click_count = m_clickHelper.clickCounter;
 
     webEvent.movement_x = event->globalX() - m_previousMousePosition.x();
@@ -1786,7 +1787,7 @@ void RenderWidgetHostViewQt::handlePointerEvent(T *event)
     else
         m_previousMousePosition = event->globalPos();
 
-    if (m_imeInProgress && webEvent.GetType() == blink::WebInputEvent::kMouseDown) {
+    if (m_imeInProgress && webEvent.GetType() == blink::WebInputEvent::Type::kMouseDown) {
         m_imeInProgress = false;
         // Tell input method to commit the pre-edit string entered so far, and finish the
         // composition operation.
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 7b0e03241..089aae79c 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -153,15 +153,18 @@ public:
     void Destroy() override;
     void SetTooltipText(const base::string16 &tooltip_text) override;
     void DisplayTooltipText(const base::string16& tooltip_text) override;
-    void WheelEventAck(const blink::WebMouseWheelEvent &event, content::InputEventAckState ack_result) override;
-    void GestureEventAck(const blink::WebGestureEvent &event, content::InputEventAckState ack_result) override;
+    void WheelEventAck(const blink::WebMouseWheelEvent &event,
+                       blink::mojom::InputEventResultState ack_result) override;
+    void GestureEventAck(const blink::WebGestureEvent &event,
+                         blink::mojom::InputEventResultState ack_result) override;
     content::MouseWheelPhaseHandler *GetMouseWheelPhaseHandler() override;
     viz::ScopedSurfaceIdAllocator DidUpdateVisualProperties(const cc::RenderFrameMetadata &metadata) override;
     void OnDidUpdateVisualPropertiesComplete(const cc::RenderFrameMetadata &metadata);
 
     void GetScreenInfo(content::ScreenInfo *results) override;
     gfx::Rect GetBoundsInRootWindow() override;
-    void ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) override;
+    void ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch,
+                                blink::mojom::InputEventResultState ack_result) override;
     viz::SurfaceId GetCurrentSurfaceId() const override;
     const viz::FrameSinkId &GetFrameSinkId() const override;
     const viz::LocalSurfaceIdAllocation &GetLocalSurfaceIdAllocation() const override;
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index 103c73ed0..4a420c14e 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -256,7 +256,7 @@ bool ContentRendererClientQt::HasErrorPage(int httpStatusCode)
     return true;
 }
 
-bool ContentRendererClientQt::ShouldSuppressErrorPage(content::RenderFrame *frame, const GURL &)
+bool ContentRendererClientQt::ShouldSuppressErrorPage(content::RenderFrame *frame, const GURL &, int)
 {
     return !(frame->GetWebkitPreferences().enable_error_page);
 }
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 91bce972f..2e2643f6d 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -89,7 +89,7 @@ public:
     void RenderThreadStarted() override;
     void ExposeInterfacesToBrowser(mojo::BinderMap* binders) override;
     void RenderFrameCreated(content::RenderFrame *render_frame) override;
-    bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) override;
+    bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &, int) override;
     bool HasErrorPage(int http_status_code) override;
 
     void PrepareErrorPage(content::RenderFrame *render_frame,
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 18fa9d922..e30b63ac7 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -372,7 +372,9 @@ static void deserializeNavigationHistory(QDataStream &input, int *currentIndex,
     }
 }
 
-static void Navigate(WebContentsAdapter *adapter, const content::NavigationController::LoadURLParams &params)
+namespace {
+
+void Navigate(WebContentsAdapter *adapter, const content::NavigationController::LoadURLParams &params)
 {
     Q_ASSERT(adapter);
     adapter->webContents()->GetController().LoadURLWithParams(params);
@@ -380,7 +382,7 @@ static void Navigate(WebContentsAdapter *adapter, const content::NavigationContr
     adapter->resetSelection();
 }
 
-static void NavigateTask(QWeakPointer<WebContentsAdapter> weakAdapter, const content::NavigationController::LoadURLParams &params)
+void NavigateTask(QWeakPointer<WebContentsAdapter> weakAdapter, const content::NavigationController::LoadURLParams &params)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     const auto adapter = weakAdapter.toStrongRef();
@@ -389,7 +391,6 @@ static void NavigateTask(QWeakPointer<WebContentsAdapter> weakAdapter, const con
     Navigate(adapter.get(), params);
 }
 
-namespace {
 static QList<WebContentsAdapter *> recursive_guard_loading_adapters;
 
 class LoadRecursionGuard {
@@ -541,7 +542,10 @@ void WebContentsAdapter::initialize(content::SiteInstance *site)
     content::RenderViewHost *rvh = m_webContents->GetRenderViewHost();
     Q_ASSERT(rvh);
     if (!rvh->IsRenderViewLive())
-        static_cast<content::WebContentsImpl*>(m_webContents.get())->CreateRenderViewForRenderManager(rvh, MSG_ROUTING_NONE, MSG_ROUTING_NONE, base::UnguessableToken::Create(), content::FrameReplicationState());
+        static_cast<content::WebContentsImpl*>(m_webContents.get())->CreateRenderViewForRenderManager(
+                rvh, MSG_ROUTING_NONE, MSG_ROUTING_NONE,
+                base::UnguessableToken::Create(), base::UnguessableToken::Create(),
+                content::FrameReplicationState());
 
     m_webContentsDelegate->RenderViewHostChanged(nullptr, rvh);
 
@@ -2027,6 +2031,7 @@ void WebContentsAdapter::undiscard()
         static_cast<content::WebContentsImpl *>(m_webContents.get())
                 ->CreateRenderViewForRenderManager(rvh, MSG_ROUTING_NONE, MSG_ROUTING_NONE,
                                                    base::UnguessableToken::Create(),
+                                                   base::UnguessableToken::Create(),
                                                    content::FrameReplicationState());
     m_webContentsDelegate->RenderViewHostChanged(nullptr, rvh);
     m_adapterClient->initializationFinished();
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 532d9653b..0aef029cf 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -233,10 +233,11 @@ QUrl WebContentsDelegateQt::url(content::WebContents* source) const {
     m_pendingUrlUpdate = false;
     return newUrl;
 }
-void WebContentsDelegateQt::AddNewContents(content::WebContents* source, std::unique_ptr<content::WebContents> new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked)
+void WebContentsDelegateQt::AddNewContents(content::WebContents* source, std::unique_ptr<content::WebContents> new_contents, const GURL &target_url,
+                                           WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked)
 {
     Q_UNUSED(source)
-    QSharedPointer<WebContentsAdapter> newAdapter = createWindow(std::move(new_contents), disposition, initial_pos, m_initialTargetUrl, user_gesture);
+    QSharedPointer<WebContentsAdapter> newAdapter = createWindow(std::move(new_contents), disposition, initial_pos, toQt(target_url), user_gesture);
     // Chromium can forget to pass user-agent override settings to new windows (see QTBUG-61774 and QTBUG-76249),
     // so set it here. Note the actual value doesn't really matter here. Only the second value does, but we try
     // to give the correct user-agent anyway.
@@ -322,7 +323,7 @@ void WebContentsDelegateQt::RenderFrameHostChanged(content::RenderFrameHost *old
         m_frameFocusedObserver.addNode(new_node);
 
         // Is this a main frame?
-        if (new_host->GetFrameOwnerElementType() == blink::FrameOwnerElementType::kNone) {
+        if (new_host->GetFrameOwnerElementType() == blink::mojom::FrameOwnerElementType::kNone) {
             content::RenderProcessHost *renderProcessHost = new_host->GetProcess();
             const base::Process &process = renderProcessHost->GetProcess();
             if (process.IsValid())
@@ -561,9 +562,8 @@ void WebContentsDelegateQt::DidUpdateFaviconURL(const std::vector<blink::mojom::
 void WebContentsDelegateQt::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 *newContents)
+                                               const GURL &/*target_url*/, content::WebContents *newContents)
 {
-    m_initialTargetUrl = toQt(target_url);
     if (auto *view = static_cast<content::WebContentsImpl *>(newContents)->GetView())
         static_cast<WebContentsViewQt *>(view)->setFactoryClient(m_viewClient);
 }
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index 5febd997b..2ff9e763f 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -120,7 +120,8 @@ public:
     // WebContentsDelegate overrides
     content::WebContents *OpenURLFromTab(content::WebContents *source, const content::OpenURLParams &params) override;
     void NavigationStateChanged(content::WebContents* source, content::InvalidateTypes changed_flags) override;
-    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 AddNewContents(content::WebContents *source, std::unique_ptr<content::WebContents> new_contents, const GURL &target_url,
+                        WindowOpenDisposition disposition, const gfx::Rect &initial_pos, bool user_gesture, bool *was_blocked) override;
     void CloseContents(content::WebContents *source) override;
     void LoadProgressChanged(double progress) override;
     bool HandleKeyboardEvent(content::WebContents *source, const content::NativeWebKeyboardEvent &event) override;
@@ -222,7 +223,6 @@ private:
     QScopedPointer<FindTextHelper> m_findTextHelper;
     SavePageInfo m_savePageInfo;
     QSharedPointer<FilePickerController> m_filePickerController;
-    QUrl m_initialTargetUrl;
     LoadingState m_loadingState;
     bool m_didStartLoadingSeen;
     FrameFocusedObserver m_frameFocusedObserver;
diff --git a/src/core/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp
index 4e20c86ea..3388d5161 100644
--- a/src/core/web_contents_view_qt.cpp
+++ b/src/core/web_contents_view_qt.cpp
@@ -147,10 +147,6 @@ void WebContentsViewQt::SetInitialFocus()
 void WebContentsViewQt::FocusThroughTabTraversal(bool reverse)
 {
     content::WebContentsImpl *web_contents = static_cast<content::WebContentsImpl*>(m_webContents);
-    if (web_contents->ShowingInterstitialPage()) {
-        web_contents->GetInterstitialPage()->FocusThroughTabTraversal(reverse);
-        return;
-    }
     content::RenderWidgetHostView *fullscreen_view = web_contents->GetFullscreenRenderWidgetHostView();
     if (fullscreen_view) {
         fullscreen_view->Focus();
diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h
index 3c89bf3b0..1ba2547d6 100644
--- a/src/core/web_contents_view_qt.h
+++ b/src/core/web_contents_view_qt.h
@@ -92,8 +92,6 @@ public:
 
     void GetContainerBounds(gfx::Rect* out) const override;
 
-    void SizeContents(const gfx::Size& size) override { }
-
     void Focus() override;
 
     void SetInitialFocus() override;
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 739abd525..3696e4865 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -59,7 +59,6 @@
 #include "components/viz/host/host_frame_sink_manager.h"
 #if QT_CONFIG(webengine_printing_and_pdf)
 #include "chrome/browser/printing/print_job_manager.h"
-#include "components/printing/browser/features.h"
 #endif
 #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
 #include "components/viz/common/features.h"
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index 77d3b56b7..3beb913a7 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -1406,36 +1406,36 @@ static WebInputEvent::Type webEventTypeForEvent(const QEvent* event)
     switch (event->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::TabletPress:
-        return WebInputEvent::kMouseDown;
+        return WebInputEvent::Type::kMouseDown;
     case QEvent::MouseButtonRelease:
     case QEvent::TabletRelease:
-        return WebInputEvent::kMouseUp;
+        return WebInputEvent::Type::kMouseUp;
     case QEvent::Enter:
-        return WebInputEvent::kMouseEnter;
+        return WebInputEvent::Type::kMouseEnter;
     case QEvent::Leave:
-        return WebInputEvent::kMouseLeave;
+        return WebInputEvent::Type::kMouseLeave;
     case QEvent::MouseMove:
     case QEvent::TabletMove:
-        return WebInputEvent::kMouseMove;
+        return WebInputEvent::Type::kMouseMove;
     case QEvent::Wheel:
-        return WebInputEvent::kMouseWheel;
+        return WebInputEvent::Type::kMouseWheel;
     case QEvent::KeyPress:
-        return WebInputEvent::kRawKeyDown;
+        return WebInputEvent::Type::kRawKeyDown;
     case QEvent::KeyRelease:
-        return WebInputEvent::kKeyUp;
+        return WebInputEvent::Type::kKeyUp;
     case QEvent::HoverMove:
-        return WebInputEvent::kMouseMove;
+        return WebInputEvent::Type::kMouseMove;
     case QEvent::TouchBegin:
-        return WebInputEvent::kTouchStart;
+        return WebInputEvent::Type::kTouchStart;
     case QEvent::TouchUpdate:
-        return WebInputEvent::kTouchMove;
+        return WebInputEvent::Type::kTouchMove;
     case QEvent::TouchEnd:
-        return WebInputEvent::kTouchEnd;
+        return WebInputEvent::Type::kTouchEnd;
     case QEvent::TouchCancel:
-        return WebInputEvent::kTouchCancel;
+        return WebInputEvent::Type::kTouchCancel;
     default:
         Q_ASSERT(false);
-        return WebInputEvent::kMouseMove;
+        return WebInputEvent::Type::kMouseMove;
     }
 }
 
@@ -1512,7 +1512,7 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QEvent *ev)
 
     WebMouseEvent webKitEvent;
     webKitEvent.SetTimeStamp(base::TimeTicks::Now());
-    webKitEvent.SetType(WebInputEvent::kMouseLeave);
+    webKitEvent.SetType(WebInputEvent::Type::kMouseLeave);
     return webKitEvent;
 }
 
@@ -1532,11 +1532,11 @@ WebGestureEvent WebEventFactory::toWebGestureEvent(QNativeGestureEvent *ev)
     Qt::NativeGestureType gestureType = ev->gestureType();
     switch (gestureType) {
     case Qt::ZoomNativeGesture:
-        webKitEvent.SetType(WebInputEvent::kGesturePinchUpdate);
+        webKitEvent.SetType(WebInputEvent::Type::kGesturePinchUpdate);
         webKitEvent.data.pinch_update.scale = static_cast<float>(ev->value() + 1.0);
         break;
     case Qt::SmartZoomNativeGesture:
-        webKitEvent.SetType(WebInputEvent::kGestureDoubleTap);
+        webKitEvent.SetType(WebInputEvent::Type::kGestureDoubleTap);
         webKitEvent.data.tap.tap_count = 1;
         break;
     case Qt::BeginNativeGesture:
@@ -1545,7 +1545,7 @@ WebGestureEvent WebEventFactory::toWebGestureEvent(QNativeGestureEvent *ev)
     case Qt::PanNativeGesture:
     case Qt::SwipeNativeGesture:
         // Not implemented by Chromium for now.
-        webKitEvent.SetType(blink::WebInputEvent::kUndefined);
+        webKitEvent.SetType(blink::WebInputEvent::Type::kUndefined);
         break;
     }
 
@@ -1661,7 +1661,7 @@ static QPointF toQt(gfx::PointF p)
 void WebEventFactory::sendUnhandledWheelEvent(const blink::WebGestureEvent &event,
                                               RenderWidgetHostViewQtDelegate *delegate)
 {
-    Q_ASSERT(event.GetType() == blink::WebInputEvent::kGestureScrollUpdate);
+    Q_ASSERT(event.GetType() == blink::WebInputEvent::Type::kGestureScrollUpdate);
 
     QWheelEvent ev(toQt(event.PositionInWidget()),
                    toQt(event.PositionInScreen()),