Adaptations for Chromium 91

Change-Id: Ie0236697615fd67e4f53df3dca013ce39628cc29
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

59 files changed, 175 insertions, 191 deletions

diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp
index bf11646b2..d7b9c2bb9 100644
--- a/src/core/browser_accessibility_qt.cpp
+++ b/src/core/browser_accessibility_qt.cpp
@@ -400,8 +400,6 @@ QAccessible::Role BrowserAccessibilityQt::role() const
         return QAccessible::Grouping;
     case ax::mojom::Role::kImage:
         return QAccessible::Graphic;
-    case ax::mojom::Role::kImageMap:
-        return QAccessible::Document;
     case ax::mojom::Role::kInlineTextBox:
         return QAccessible::StaticText;
     case ax::mojom::Role::kInputTime:
diff --git a/src/core/browser_main_parts_qt.cpp b/src/core/browser_main_parts_qt.cpp
index 51a910018..438da7df8 100644
--- a/src/core/browser_main_parts_qt.cpp
+++ b/src/core/browser_main_parts_qt.cpp
@@ -60,6 +60,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/common/content_features.h"
+#include "content/public/common/result_codes.h"
 #include "extensions/buildflags/buildflags.h"
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "content/public/browser/plugin_service.h"
@@ -244,7 +245,7 @@ int BrowserMainPartsQt::PreEarlyInitialization()
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(extensions::kExtensionScheme);
 #endif //ENABLE_EXTENSIONS
-    return 0;
+    return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 void BrowserMainPartsQt::PreMainMessageLoopStart()
@@ -257,7 +258,7 @@ void BrowserMainPartsQt::PostMainMessageLoopStart()
         device_event_log::Initialize(0 /* default max entries */);
 }
 
-void BrowserMainPartsQt::PreMainMessageLoopRun()
+int BrowserMainPartsQt::PreMainMessageLoopRun()
 {
     ui::SelectFileDialog::SetFactory(new SelectFileDialogFactoryQt());
 
@@ -277,6 +278,7 @@ void BrowserMainPartsQt::PreMainMessageLoopRun()
                            base::BindOnce(&WebUsbDetectorQt::Initialize,
                                           base::Unretained(m_webUsbDetector.get())));
     }
+    return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 void BrowserMainPartsQt::PostMainMessageLoopRun()
@@ -306,7 +308,7 @@ int BrowserMainPartsQt::PreCreateThreads()
 #else
     display::Screen::SetScreenInstance(new DesktopScreenQt);
 #endif
-    return 0;
+    return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 static void CreatePoliciesAndDecorators(performance_manager::Graph *graph)
diff --git a/src/core/browser_main_parts_qt.h b/src/core/browser_main_parts_qt.h
index 07e8ffe98..69e129af2 100644
--- a/src/core/browser_main_parts_qt.h
+++ b/src/core/browser_main_parts_qt.h
@@ -70,7 +70,7 @@ public:
     int PreEarlyInitialization() override;
     void PreMainMessageLoopStart() override;
     void PostMainMessageLoopStart() override;
-    void PreMainMessageLoopRun() override;
+    int PreMainMessageLoopRun() override;
     void PostMainMessageLoopRun() override;
     int PreCreateThreads() override;
     void PostCreateThreads() override;
diff --git a/src/core/certificate_error_controller.cpp b/src/core/certificate_error_controller.cpp
index d9a07ae47..1151fb5c5 100644
--- a/src/core/certificate_error_controller.cpp
+++ b/src/core/certificate_error_controller.cpp
@@ -182,7 +182,7 @@ void CertificateErrorController::deactivate()
 }
 
 static QString getQStringForMessageId(int message_id) {
-    base::string16 string = l10n_util::GetStringUTF16(message_id);
+    std::u16string string = l10n_util::GetStringUTF16(message_id);
     return toQt(string);
 }
 
diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp
index 6549a19da..786129b40 100644
--- a/src/core/clipboard_qt.cpp
+++ b/src/core/clipboard_qt.cpp
@@ -229,7 +229,7 @@ void ClipboardQt::Clear(ui::ClipboardBuffer type)
 
 void ClipboardQt::ReadAvailableTypes(ui::ClipboardBuffer type,
                                      const ui::DataTransferEndpoint *data_dst,
-                                     std::vector<base::string16> *types) const
+                                     std::vector<std::u16string> *types) const
 {
     if (!types) {
         NOTREACHED();
@@ -253,7 +253,7 @@ void ClipboardQt::ReadAvailableTypes(ui::ClipboardBuffer type,
 
 void ClipboardQt::ReadText(ui::ClipboardBuffer type,
                            const ui::DataTransferEndpoint *data_dst,
-                           base::string16 *result) const
+                           std::u16string *result) const
 {
     const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
             type == ui::ClipboardBuffer::kCopyPaste ? QClipboard::Clipboard : QClipboard::Selection);
@@ -273,7 +273,7 @@ void ClipboardQt::ReadAsciiText(ui::ClipboardBuffer type,
 
 void ClipboardQt::ReadHTML(ui::ClipboardBuffer type,
                            const ui::DataTransferEndpoint *data_dst,
-                           base::string16 *markup, std::string *src_url,
+                           std::u16string *markup, std::string *src_url,
                            uint32_t *fragment_start, uint32_t *fragment_end) const
 {
     markup->clear();
@@ -357,9 +357,9 @@ void ClipboardQt::ReadImage(ui::ClipboardBuffer type,
     return std::move(callback).Run(bitmap);
 }
 
-void ClipboardQt::ReadCustomData(ui::ClipboardBuffer clipboard_type, const base::string16 &type,
+void ClipboardQt::ReadCustomData(ui::ClipboardBuffer clipboard_type, const std::u16string &type,
                                  const ui::DataTransferEndpoint *data_dst,
-                                 base::string16 *result) const
+                                 std::u16string *result) const
 {
     const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
             clipboard_type == ui::ClipboardBuffer::kCopyPaste ? QClipboard::Clipboard : QClipboard::Selection);
@@ -369,14 +369,14 @@ void ClipboardQt::ReadCustomData(ui::ClipboardBuffer clipboard_type, const base:
     ui::ReadCustomDataForType(customData.constData(), customData.size(), type, result);
 }
 
-void ClipboardQt::ReadBookmark(const ui::DataTransferEndpoint *data_dst, base::string16 *title, std::string *url) const
+void ClipboardQt::ReadBookmark(const ui::DataTransferEndpoint *data_dst, std::u16string *title, std::string *url) const
 {
     NOTIMPLEMENTED();
 }
 
 void ClipboardQt::ReadSvg(ui::ClipboardBuffer clipboard_type,
                           const ui::DataTransferEndpoint *,
-                          base::string16 *result) const
+                          std::u16string *result) const
 {
     const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData(
             clipboard_type == ui::ClipboardBuffer::kCopyPaste ? QClipboard::Clipboard : QClipboard::Selection);
@@ -450,10 +450,10 @@ bool ClipboardQt::IsSelectionBufferAvailable() const
 }
 #endif
 
-std::vector<base::string16> ClipboardQt::ReadAvailablePlatformSpecificFormatNames(ui::ClipboardBuffer buffer, const ui::DataTransferEndpoint *data_dst) const
+std::vector<std::u16string> ClipboardQt::ReadAvailablePlatformSpecificFormatNames(ui::ClipboardBuffer buffer, const ui::DataTransferEndpoint *data_dst) const
 {
     // based on ClipboardX11
-    std::vector<base::string16> types;
+    std::vector<std::u16string> types;
     if (IsFormatAvailable(ui::ClipboardFormatType::GetPlainTextType(), buffer, data_dst))
         types.push_back(base::UTF8ToUTF16(ui::ClipboardFormatType::GetPlainTextType().GetName()));
     if (IsFormatAvailable(ui::ClipboardFormatType::GetHtmlType(), buffer, data_dst))
diff --git a/src/core/clipboard_qt.h b/src/core/clipboard_qt.h
index 0b77d2266..caf26073b 100644
--- a/src/core/clipboard_qt.h
+++ b/src/core/clipboard_qt.h
@@ -54,22 +54,22 @@ public:
     void Clear(ui::ClipboardBuffer type) override;
     void ReadAvailableTypes(ui::ClipboardBuffer type,
                             const ui::DataTransferEndpoint *data_dst,
-                            std::vector<base::string16> *types) const override;
-    void ReadText(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, base::string16 *result) const override;
+                            std::vector<std::u16string> *types) const override;
+    void ReadText(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, std::u16string *result) const override;
     void ReadAsciiText(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, std::string *result) const override;
-    void ReadHTML(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, base::string16 *markup, std::string *src_url, uint32_t *fragment_start,
+    void ReadHTML(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, std::u16string *markup, std::string *src_url, uint32_t *fragment_start,
                   uint32_t *fragment_end) const override;
     void ReadRTF(ui::ClipboardBuffer type, const ui::DataTransferEndpoint *data_dst, std::string *result) const override;
     void ReadImage(ui::ClipboardBuffer buffer, const ui::DataTransferEndpoint *data_dst, ReadImageCallback callback) const override;
-    void ReadCustomData(ui::ClipboardBuffer clipboard_type, const base::string16 &type, const ui::DataTransferEndpoint *data_dst, base::string16 *result) const override;
-    void ReadBookmark(const ui::DataTransferEndpoint *data_dst, base::string16 *title, std::string *url) const override;
+    void ReadCustomData(ui::ClipboardBuffer clipboard_type, const std::u16string &type, const ui::DataTransferEndpoint *data_dst, std::u16string *result) const override;
+    void ReadBookmark(const ui::DataTransferEndpoint *data_dst, std::u16string *title, std::string *url) const override;
     void ReadData(const ui::ClipboardFormatType &format, const ui::DataTransferEndpoint *data_dst, std::string *result) const override;
 #if defined(USE_OZONE)
     bool IsSelectionBufferAvailable() const override;
 #endif
     void OnPreShutdown() override {}
-    void ReadSvg(ui::ClipboardBuffer, const ui::DataTransferEndpoint *, base::string16 *) const override;
-    std::vector<base::string16> ReadAvailablePlatformSpecificFormatNames(ui::ClipboardBuffer buffer, const ui::DataTransferEndpoint *data_dst) const override;
+    void ReadSvg(ui::ClipboardBuffer, const ui::DataTransferEndpoint *, std::u16string *) const override;
+    std::vector<std::u16string> ReadAvailablePlatformSpecificFormatNames(ui::ClipboardBuffer buffer, const ui::DataTransferEndpoint *data_dst) const override;
 
 
     const ui::DataTransferEndpoint *GetSource(ui::ClipboardBuffer buffer) const override;
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index f8d1afe10..929506dc8 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -409,9 +409,9 @@ void ContentBrowserClientQt::DidCreatePpapiPlugin(content::BrowserPpapiHost* bro
 }
 #endif
 
-content::DevToolsManagerDelegate* ContentBrowserClientQt::GetDevToolsManagerDelegate()
+std::unique_ptr<content::DevToolsManagerDelegate> ContentBrowserClientQt::CreateDevToolsManagerDelegate()
 {
-    return new DevToolsManagerDelegateQt;
+    return std::make_unique<DevToolsManagerDelegateQt>();
 }
 
 content::PlatformNotificationService *ContentBrowserClientQt::GetPlatformNotificationService(content::BrowserContext *browser_context)
@@ -700,6 +700,7 @@ static void LaunchURL(const GURL& url,
 bool ContentBrowserClientQt::HandleExternalProtocol(const GURL &url,
         base::OnceCallback<content::WebContents*()> web_contents_getter,
         int child_id,
+        int frame_tree_node_id,
         content::NavigationUIData *navigation_data,
         bool is_main_frame,
         ui::PageTransition page_transition,
@@ -708,6 +709,7 @@ bool ContentBrowserClientQt::HandleExternalProtocol(const GURL &url,
         mojo::PendingRemote<network::mojom::URLLoaderFactory> *out_factory)
 {
     Q_UNUSED(child_id);
+    Q_UNUSED(frame_tree_node_id);
     Q_UNUSED(navigation_data);
     Q_UNUSED(initiating_origin);
     Q_UNUSED(out_factory);
@@ -1101,7 +1103,7 @@ void ContentBrowserClientQt::RegisterNonNetworkSubresourceURLLoaderFactories(int
 
     if (install_file_scheme && factories->find(url::kFileScheme) == factories->end()) {
         auto file_factory = content::CreateFileURLLoaderFactory(profile->GetPath(),
-                                                                profile->GetSharedCorsOriginAccessList());
+                                                                content::BrowserContext::GetSharedCorsOriginAccessList(profile));
         factories->emplace(url::kFileScheme, std::move(file_factory));
     }
 
@@ -1180,13 +1182,23 @@ bool ContentBrowserClientQt::WillCreateURLLoaderFactory(
         bool *disable_secure_dns,
         network::mojom::URLLoaderFactoryOverridePtr *factory_override)
 {
+    Q_UNUSED(render_process_id);
+    Q_UNUSED(type);
+    Q_UNUSED(request_initiator);
+    Q_UNUSED(navigation_id);
+    Q_UNUSED(ukm_source_id);
+    Q_UNUSED(header_client);
+    Q_UNUSED(bypass_redirect_checks);
+    Q_UNUSED(disable_secure_dns);
+    Q_UNUSED(factory_override);
     auto adapter = static_cast<ProfileQt *>(browser_context)->profileAdapter();
-    int process_id = type == URLLoaderFactoryType::kNavigation ? 0 : render_process_id;
     auto proxied_receiver = std::move(*factory_receiver);
     mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_url_loader_factory;
     *factory_receiver = pending_url_loader_factory.InitWithNewPipeAndPassReceiver();
     // Will manage its own lifetime
-    new ProxyingURLLoaderFactoryQt(adapter, process_id, std::move(proxied_receiver), std::move(pending_url_loader_factory));
+    new ProxyingURLLoaderFactoryQt(adapter,
+                                   frame ? frame->GetFrameTreeNodeId() : content::RenderFrameHost::kNoFrameTreeNodeId,
+                                   std::move(proxied_receiver), std::move(pending_url_loader_factory));
     return true;
 }
 
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 94ee69bf1..4d4a3ae90 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -92,7 +92,7 @@ public:
                                               net::ClientCertIdentityList client_certs,
                                               std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
     std::unique_ptr<net::ClientCertStore> CreateClientCertStore(content::BrowserContext *browser_context) override;
-    content::DevToolsManagerDelegate *GetDevToolsManagerDelegate() override;
+    std::unique_ptr<content::DevToolsManagerDelegate> CreateDevToolsManagerDelegate() override;
     content::PlatformNotificationService * GetPlatformNotificationService(content::BrowserContext *browser_context) override;
 
     std::string GetApplicationLocale() override;
@@ -198,6 +198,7 @@ public:
             const GURL &url,
             base::OnceCallback<content::WebContents*()> web_contents_getter,
             int child_id,
+            int frame_tree_node_id,
             content::NavigationUIData *navigation_data,
             bool is_main_frame,
             ui::PageTransition page_transition,
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index e06cde63d..ed98dd48d 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -373,7 +373,7 @@ gfx::Image &ContentClientQt::GetNativeImageNamed(int resource_id)
     return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
 }
 
-base::string16 ContentClientQt::GetLocalizedString(int message_id)
+std::u16string ContentClientQt::GetLocalizedString(int message_id)
 {
     return l10n_util::GetStringUTF16(message_id);
 }
diff --git a/src/core/content_client_qt.h b/src/core/content_client_qt.h
index a7fc7432a..e32a291dd 100644
--- a/src/core/content_client_qt.h
+++ b/src/core/content_client_qt.h
@@ -59,7 +59,7 @@ public:
     base::StringPiece GetDataResource(int, ui::ScaleFactor) override;
     base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
     gfx::Image &GetNativeImageNamed(int resource_id) override;
-    base::string16 GetLocalizedString(int message_id) override;
+    std::u16string GetLocalizedString(int message_id) override;
 };
 
 } // namespace QtWebEngineCore
diff --git a/src/core/devtools_frontend_qt.cpp b/src/core/devtools_frontend_qt.cpp
index 9a7736964..8a23d326f 100644
--- a/src/core/devtools_frontend_qt.cpp
+++ b/src/core/devtools_frontend_qt.cpp
@@ -306,7 +306,7 @@ void DevToolsFrontendQt::ReadyToCommitNavigation(content::NavigationHandle *navi
     }
 }
 
-void DevToolsFrontendQt::DocumentAvailableInMainFrame()
+void DevToolsFrontendQt::DocumentAvailableInMainFrame(content::RenderFrameHost * /*render_frame_host*/)
 {
     if (!m_inspectedContents)
         return;
@@ -457,7 +457,7 @@ void DevToolsFrontendQt::HandleMessageFromDevToolsFrontend(const std::string &me
             SendMessageAck(request_id, &response);
             return;
         } else {
-            auto *partition = content::BrowserContext::GetStoragePartitionForSite(
+            auto *partition = content::BrowserContext::GetStoragePartitionForUrl(
                                   web_contents()->GetBrowserContext(), gurl);
             network_url_loader_factory = partition->GetURLLoaderFactoryForBrowserProcess();
             url_loader_factory = network_url_loader_factory.get();
@@ -586,7 +586,7 @@ void DevToolsFrontendQt::DispatchProtocolMessage(content::DevToolsAgentHost *age
         std::string param;
         base::EscapeJSONString(message_sp, true, &param);
         std::string code = "DevToolsAPI.dispatchMessage(" + param + ");";
-        base::string16 javascript = base::UTF8ToUTF16(code);
+        std::u16string javascript = base::UTF8ToUTF16(code);
         web_contents()->GetMainFrame()->ExecuteJavaScript(javascript, base::NullCallback());
         return;
     }
@@ -597,7 +597,7 @@ void DevToolsFrontendQt::DispatchProtocolMessage(content::DevToolsAgentHost *age
         base::EscapeJSONString(message_sp.substr(pos, kMaxMessageChunkSize), true, &param);
         std::string code = "DevToolsAPI.dispatchMessageChunk(" + param + ","
                          + std::to_string(pos ? 0 : total_size) + ");";
-        base::string16 javascript = base::UTF8ToUTF16(code);
+        std::u16string javascript = base::UTF8ToUTF16(code);
         web_contents()->GetMainFrame()->ExecuteJavaScript(javascript, base::NullCallback());
     }
 }
diff --git a/src/core/devtools_frontend_qt.h b/src/core/devtools_frontend_qt.h
index aac5909dc..441e5171e 100644
--- a/src/core/devtools_frontend_qt.h
+++ b/src/core/devtools_frontend_qt.h
@@ -106,7 +106,7 @@ protected:
 private:
     // WebContentsObserver overrides
     void ReadyToCommitNavigation(content::NavigationHandle* navigation_handle) override;
-    void DocumentAvailableInMainFrame() override;
+    void DocumentAvailableInMainFrame(content::RenderFrameHost *render_frame_host) override;
     void WebContentsDestroyed() override;
 
     void SendMessageAck(int request_id, const base::Value* arg1);
diff --git a/src/core/extensions/extension_system_qt.cpp b/src/core/extensions/extension_system_qt.cpp
index 99b56786b..7c5780ef2 100644
--- a/src/core/extensions/extension_system_qt.cpp
+++ b/src/core/extensions/extension_system_qt.cpp
@@ -167,7 +167,7 @@ void ExtensionSystemQt::LoadExtension(std::string extension_id, std::unique_ptr<
     std::string error;
     scoped_refptr<const Extension> extension = Extension::Create(
             directory,
-            Manifest::COMPONENT,
+            mojom::ManifestLocation::kComponent,
             *manifest,
             flags,
             &error);
diff --git a/src/core/extensions/extensions_browser_client_qt.cpp b/src/core/extensions/extensions_browser_client_qt.cpp
index 406facc5c..8a921aa8b 100644
--- a/src/core/extensions/extensions_browser_client_qt.cpp
+++ b/src/core/extensions/extensions_browser_client_qt.cpp
@@ -50,6 +50,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/task/post_task.h"
+#include "base/task/thread_pool.h"
 #include "base/memory/ref_counted_memory.h"
 #include "chrome/browser/extensions/api/generated_api_registration.h"
 #include "chrome/browser/profiles/profile.h"
@@ -172,8 +173,8 @@ private:
         auto data = GetResource(resource_id, request.url.host());
 
         std::string *read_mime_type = new std::string;
-        base::PostTaskAndReplyWithResult(
-                FROM_HERE, { base::ThreadPool(), base::MayBlock() },
+        base::ThreadPool::PostTaskAndReplyWithResult(
+                FROM_HERE, { base::MayBlock() },
                 base::BindOnce(&net::GetMimeTypeFromFile, filename, base::Unretained(read_mime_type)),
                 base::BindOnce(&ResourceBundleFileLoader::OnMimeTypeRead, weak_factory_.GetWeakPtr(), std::move(data),
                                base::Owned(read_mime_type)));
diff --git a/src/core/favicon_driver_qt.cpp b/src/core/favicon_driver_qt.cpp
index a3bbd5939..2ec36f826 100644
--- a/src/core/favicon_driver_qt.cpp
+++ b/src/core/favicon_driver_qt.cpp
@@ -340,7 +340,7 @@ void FaviconDriverQt::DidFinishNavigation(content::NavigationHandle *navigation_
     FetchFavicon(url, navigation_handle->IsSameDocument());
 }
 
-void FaviconDriverQt::DocumentOnLoadCompletedInMainFrame()
+void FaviconDriverQt::DocumentOnLoadCompletedInMainFrame(content::RenderFrameHost * /*render_frame_host*/)
 {
     m_documentOnLoadCompleted = true;
 }
diff --git a/src/core/favicon_driver_qt.h b/src/core/favicon_driver_qt.h
index b49017946..0e9b7d46f 100644
--- a/src/core/favicon_driver_qt.h
+++ b/src/core/favicon_driver_qt.h
@@ -125,7 +125,7 @@ private:
                                  const base::Optional<GURL> &manifest_url) override;
     void DidStartNavigation(content::NavigationHandle *navigation_handle) override;
     void DidFinishNavigation(content::NavigationHandle *navigation_handle) override;
-    void DocumentOnLoadCompletedInMainFrame() override;
+    void DocumentOnLoadCompletedInMainFrame(content::RenderFrameHost *render_frame_host) override;
 
     // Informs FaviconService that the favicon for |url| is out of date. If
     // |force_reload| is true, then discard information about favicon download
diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp
index 90f5dcc07..140cb7dba 100644
--- a/src/core/file_picker_controller.cpp
+++ b/src/core/file_picker_controller.cpp
@@ -225,7 +225,7 @@ void FilePickerController::filesSelectedInChooser(const QStringList &filesList)
         std::vector<blink::mojom::FileChooserFileInfoPtr> chooser_files;
         for (const auto &file : qAsConst(files)) {
             chooser_files.push_back(blink::mojom::FileChooserFileInfo::NewNativeFile(
-                    blink::mojom::NativeFileInfo::New(toFilePath(file), base::string16())));
+                    blink::mojom::NativeFileInfo::New(toFilePath(file), std::u16string())));
         }
 
         if (files.isEmpty())
diff --git a/src/core/javascript_dialog_controller.cpp b/src/core/javascript_dialog_controller.cpp
index 86f5b9795..d47d5363d 100644
--- a/src/core/javascript_dialog_controller.cpp
+++ b/src/core/javascript_dialog_controller.cpp
@@ -45,7 +45,7 @@
 
 namespace QtWebEngineCore {
 
-void JavaScriptDialogControllerPrivate::dialogFinished(bool accepted, const base::string16 &promptValue)
+void JavaScriptDialogControllerPrivate::dialogFinished(bool accepted, const std::u16string &promptValue)
 {
     // Clear the queue first as this could result in the engine asking us to run another dialog,
     // but hold a shared pointer so the dialog does not get deleted prematurely when running in-process.
diff --git a/src/core/javascript_dialog_controller_p.h b/src/core/javascript_dialog_controller_p.h
index ab7b09268..44c0dace5 100644
--- a/src/core/javascript_dialog_controller_p.h
+++ b/src/core/javascript_dialog_controller_p.h
@@ -67,7 +67,7 @@ namespace QtWebEngineCore {
 class JavaScriptDialogControllerPrivate {
 
 public:
-    void dialogFinished(bool accepted, const base::string16 &promptValue);
+    void dialogFinished(bool accepted, const std::u16string &promptValue);
     JavaScriptDialogControllerPrivate(WebContentsAdapterClient::JavascriptDialogType, const QString &message, const QString &prompt
                                       , const QString& title, const QUrl &securityOrigin
                                       , content::JavaScriptDialogManager::DialogClosedCallback &&, content::WebContents *);
diff --git a/src/core/javascript_dialog_manager_qt.cpp b/src/core/javascript_dialog_manager_qt.cpp
index 289947237..64c084810 100644
--- a/src/core/javascript_dialog_manager_qt.cpp
+++ b/src/core/javascript_dialog_manager_qt.cpp
@@ -63,8 +63,8 @@ JavaScriptDialogManagerQt *JavaScriptDialogManagerQt::GetInstance()
 void JavaScriptDialogManagerQt::RunJavaScriptDialog(content::WebContents *webContents,
                                                     content::RenderFrameHost *renderFrameHost,
                                                     content::JavaScriptDialogType dialog_type,
-                                                    const base::string16 &messageText,
-                                                    const base::string16 &defaultPromptText,
+                                                    const std::u16string &messageText,
+                                                    const std::u16string &defaultPromptText,
                                                     content::JavaScriptDialogManager::DialogClosedCallback callback,
                                                     bool *didSuppressMessage)
 {
@@ -87,12 +87,12 @@ void JavaScriptDialogManagerQt::RunBeforeUnloadDialog(content::WebContents *webC
     runDialogForContents(webContents, WebContentsAdapterClient::UnloadDialog, QString(), QString(), toQt(originUrl), std::move(callback));
 }
 
-bool JavaScriptDialogManagerQt::HandleJavaScriptDialog(content::WebContents *contents, bool accept, const base::string16 *promptOverride)
+bool JavaScriptDialogManagerQt::HandleJavaScriptDialog(content::WebContents *contents, bool accept, const std::u16string *promptOverride)
 {
     QSharedPointer<JavaScriptDialogController> dialog = m_activeDialogs.value(contents);
     if (!dialog)
         return false;
-    dialog->d->dialogFinished(accept, promptOverride ? *promptOverride : base::string16());
+    dialog->d->dialogFinished(accept, promptOverride ? *promptOverride : std::u16string());
     takeDialogForContents(contents);
     return true;
 }
diff --git a/src/core/javascript_dialog_manager_qt.h b/src/core/javascript_dialog_manager_qt.h
index ca7432a77..4684961e8 100644
--- a/src/core/javascript_dialog_manager_qt.h
+++ b/src/core/javascript_dialog_manager_qt.h
@@ -61,14 +61,14 @@ public:
     static JavaScriptDialogManagerQt *GetInstance();
 
     void RunJavaScriptDialog(content::WebContents *, content::RenderFrameHost *, content::JavaScriptDialogType dialog_type,
-                             const base::string16 &messageText, const base::string16 &defaultPromptText,
+                             const std::u16string &messageText, const std::u16string &defaultPromptText,
                              DialogClosedCallback callback,
                              bool *didSuppressMessage) override;
     void RunBeforeUnloadDialog(content::WebContents *web_contents,
                                content::RenderFrameHost *render_frame_host,
                                bool is_reload,
                                DialogClosedCallback callback) override;
-    bool HandleJavaScriptDialog(content::WebContents *, bool accept, const base::string16 *promptOverride) override;
+    bool HandleJavaScriptDialog(content::WebContents *, bool accept, const std::u16string *promptOverride) override;
     void CancelDialogs(content::WebContents *contents, bool /*reset_state*/) override
     {
         takeDialogForContents(contents);
diff --git a/src/core/net/custom_url_loader_factory.cpp b/src/core/net/custom_url_loader_factory.cpp
index dca69c20f..9239d70ae 100644
--- a/src/core/net/custom_url_loader_factory.cpp
+++ b/src/core/net/custom_url_loader_factory.cpp
@@ -472,7 +472,6 @@ public:
 
     // network::mojom::URLLoaderFactory:
     void CreateLoaderAndStart(mojo::PendingReceiver<network::mojom::URLLoader> loader,
-                              int32_t routing_id,
                               int32_t request_id,
                               uint32_t options,
                               const network::ResourceRequest &request,
@@ -480,7 +479,6 @@ public:
                               const net::MutableNetworkTrafficAnnotationTag &traffic_annotation) override
     {
         DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-        Q_UNUSED(routing_id);
         Q_UNUSED(request_id);
         Q_UNUSED(options);
         Q_UNUSED(traffic_annotation);
diff --git a/src/core/net/proxying_url_loader_factory_qt.cpp b/src/core/net/proxying_url_loader_factory_qt.cpp
index 6505e5505..76e433fab 100644
--- a/src/core/net/proxying_url_loader_factory_qt.cpp
+++ b/src/core/net/proxying_url_loader_factory_qt.cpp
@@ -111,7 +111,7 @@ class InterceptedRequest : public network::mojom::URLLoader
 {
 public:
     InterceptedRequest(ProfileAdapter *profile_adapter,
-                       int process_id, uint64_t request_id, int32_t routing_id, uint32_t options,
+                       int frame_tree_node_id, int32_t request_id, uint32_t options,
                        const network::ResourceRequest &request,
                        const net::MutableNetworkTrafficAnnotationTag &traffic_annotation,
                        mojo::PendingReceiver<network::mojom::URLLoader> loader,
@@ -129,6 +129,7 @@ public:
     void OnTransferSizeUpdated(int32_t transfer_size_diff) override;
     void OnStartLoadingResponseBody(mojo::ScopedDataPipeConsumerHandle body) override;
     void OnComplete(const network::URLLoaderCompletionStatus &status) override;
+    void OnReceiveEarlyHints(network::mojom::EarlyHintsPtr) override {}
 
     // network::mojom::URLLoader
     void FollowRedirect(const std::vector<std::string> &removed_headers,
@@ -163,9 +164,8 @@ private:
     QWebEngineUrlRequestInterceptor* getPageInterceptor();
 
     QPointer<ProfileAdapter> profile_adapter_;
-    const int process_id_;
-    const uint64_t request_id_;
-    const int32_t routing_id_;
+    const int frame_tree_node_id_;
+    const int32_t request_id_;
     const uint32_t options_;
     bool allowed_cors_ = true;
 
@@ -191,16 +191,15 @@ private:
 };
 
 InterceptedRequest::InterceptedRequest(ProfileAdapter *profile_adapter,
-                                       int process_id, uint64_t request_id, int32_t routing_id, uint32_t options,
+                                       int frame_tree_node_id, int32_t request_id, uint32_t options,
                                        const network::ResourceRequest &request,
                                        const net::MutableNetworkTrafficAnnotationTag &traffic_annotation,
                                        mojo::PendingReceiver<network::mojom::URLLoader> loader_receiver,
                                        mojo::PendingRemote<network::mojom::URLLoaderClient> client,
                                        mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory)
     : profile_adapter_(profile_adapter)
-    , process_id_(process_id)
+    , frame_tree_node_id_(frame_tree_node_id)
     , request_id_(request_id)
-    , routing_id_(routing_id)
     , options_(options)
     , request_(request)
     , traffic_annotation_(traffic_annotation)
@@ -249,12 +248,9 @@ InterceptedRequest::~InterceptedRequest()
 
 content::WebContents* InterceptedRequest::webContents()
 {
-    if (process_id_) {
-        content::RenderFrameHost *frameHost = content::RenderFrameHost::FromID(process_id_, request_.render_frame_id);
-        return content::WebContents::FromRenderFrameHost(frameHost);
-    }
-
-    return content::WebContents::FromFrameTreeNodeId(request_.render_frame_id);
+    if (frame_tree_node_id_ == content::RenderFrameHost::kNoFrameTreeNodeId)
+        return nullptr;
+    return content::WebContents::FromFrameTreeNodeId(frame_tree_node_id_);
 }
 
 QWebEngineUrlRequestInterceptor* InterceptedRequest::getProfileInterceptor()
@@ -375,7 +371,7 @@ void InterceptedRequest::ContinueAfterIntercept()
     }
 
     if (!target_loader_ && target_factory_) {
-        target_factory_->CreateLoaderAndStart(target_loader_.BindNewPipeAndPassReceiver(), routing_id_, request_id_,
+        target_factory_->CreateLoaderAndStart(target_loader_.BindNewPipeAndPassReceiver(), request_id_,
                                               options_, request_, proxied_client_receiver_.BindNewPipeAndPassRemote(),
                                               traffic_annotation_);
     }
@@ -522,10 +518,10 @@ void InterceptedRequest::SendErrorAndCompleteImmediately(int error_code)
     delete this;
 }
 
-ProxyingURLLoaderFactoryQt::ProxyingURLLoaderFactoryQt(ProfileAdapter *adapter, int process_id,
+ProxyingURLLoaderFactoryQt::ProxyingURLLoaderFactoryQt(ProfileAdapter *adapter, int frame_tree_node_id,
                                                        mojo::PendingReceiver<network::mojom::URLLoaderFactory> loader_receiver,
                                                        mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory_info)
-    : m_profileAdapter(adapter), m_processId(process_id), m_weakFactory(this)
+    : m_profileAdapter(adapter), m_frameTreeNodeId(frame_tree_node_id), m_weakFactory(this)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     if (target_factory_info) {
@@ -543,8 +539,8 @@ ProxyingURLLoaderFactoryQt::~ProxyingURLLoaderFactoryQt()
     m_weakFactory.InvalidateWeakPtrs();
 }
 
-void ProxyingURLLoaderFactoryQt::CreateLoaderAndStart(mojo::PendingReceiver<network::mojom::URLLoader> loader, int32_t routing_id,
-                                                      int32_t request_id, uint32_t options, const network::ResourceRequest &request,
+void ProxyingURLLoaderFactoryQt::CreateLoaderAndStart(mojo::PendingReceiver<network::mojom::URLLoader> loader, int32_t request_id,
+                                                      uint32_t options, const network::ResourceRequest &request,
                                                       mojo::PendingRemote<network::mojom::URLLoaderClient> url_loader_client,
                                                       const net::MutableNetworkTrafficAnnotationTag &traffic_annotation)
 {
@@ -554,7 +550,7 @@ void ProxyingURLLoaderFactoryQt::CreateLoaderAndStart(mojo::PendingReceiver<netw
         m_targetFactory->Clone(target_factory_clone.InitWithNewPipeAndPassReceiver());
 
     // Will manage its own lifetime
-    InterceptedRequest *req = new InterceptedRequest(m_profileAdapter, m_processId, request_id, routing_id, options,
+    InterceptedRequest *req = new InterceptedRequest(m_profileAdapter, m_frameTreeNodeId, request_id, options,
                                                      request, traffic_annotation, std::move(loader),
                                                      std::move(url_loader_client), std::move(target_factory_clone));
     req->Restart();
diff --git a/src/core/net/proxying_url_loader_factory_qt.h b/src/core/net/proxying_url_loader_factory_qt.h
index 5345e3220..ae8e41eaf 100644
--- a/src/core/net/proxying_url_loader_factory_qt.h
+++ b/src/core/net/proxying_url_loader_factory_qt.h
@@ -62,14 +62,14 @@ class ProfileAdapter;
 class ProxyingURLLoaderFactoryQt : public network::mojom::URLLoaderFactory
 {
 public:
-    ProxyingURLLoaderFactoryQt(ProfileAdapter *adapter, int processId,
+    ProxyingURLLoaderFactoryQt(ProfileAdapter *adapter, int frameTreeNodeId,
                                mojo::PendingReceiver<network::mojom::URLLoaderFactory> loader_receiver,
                                mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_target_factory_remote);
 
     ~ProxyingURLLoaderFactoryQt() override;
 
     void CreateLoaderAndStart(mojo::PendingReceiver<network::mojom::URLLoader> loader,
-                              int32_t routing_id, int32_t request_id,
+                              int32_t request_id,
                               uint32_t options, const network::ResourceRequest &request,
                               mojo::PendingRemote<network::mojom::URLLoaderClient> client,
                               const net::MutableNetworkTrafficAnnotationTag &traffic_annotation) override;
@@ -81,7 +81,7 @@ private:
     void OnProxyBindingError();
 
     QPointer<ProfileAdapter> m_profileAdapter;
-    int m_processId;
+    int m_frameTreeNodeId;
     mojo::ReceiverSet<network::mojom::URLLoaderFactory> m_proxyReceivers;
     mojo::Remote<network::mojom::URLLoaderFactory> m_targetFactory;
     base::WeakPtrFactory<ProxyingURLLoaderFactoryQt> m_weakFactory;
diff --git a/src/core/net/system_network_context_manager.cpp b/src/core/net/system_network_context_manager.cpp
index 46e678110..5eb11dab9 100644
--- a/src/core/net/system_network_context_manager.cpp
+++ b/src/core/net/system_network_context_manager.cpp
@@ -46,12 +46,14 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/strings/string_split.h"
 #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/certificate_transparency/ct_known_logs.h"
 #include "components/network_session_configurator/common/network_switches.h"
 #include "content/public/browser/network_service_instance.h"
 #include "content/public/common/content_switches.h"
+#include "net/base/port_util.h"
 #include "net/net_buildflags.h"
 #include "services/cert_verifier/public/mojom/cert_verifier_service_factory.mojom.h"
 #include "services/network/network_service.h"
@@ -103,7 +105,6 @@ public:
     // mojom::URLLoaderFactory implementation:
 
     void CreateLoaderAndStart(mojo::PendingReceiver<network::mojom::URLLoader> receiver,
-                              int32_t routing_id,
                               int32_t request_id,
                               uint32_t options,
                               const network::ResourceRequest &url_request,
@@ -114,7 +115,7 @@ public:
         if (!manager_)
             return;
         manager_->GetURLLoaderFactory()->CreateLoaderAndStart(
-                    std::move(receiver), routing_id, request_id, options, url_request,
+                    std::move(receiver), request_id, options, url_request,
                     std::move(client), traffic_annotation);
     }
 
@@ -226,6 +227,23 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(network::mojom::Networ
         network_service_network_context_.BindNewPipeAndPassReceiver(),
         CreateNetworkContextParams());
 
+    // Handle --explicitly-allowed-ports
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kExplicitlyAllowedPorts)) {
+        std::vector<uint16_t> explicitly_allowed_network_ports;
+        std::string switch_value =
+            base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kExplicitlyAllowedPorts);
+        const auto split = base::SplitStringPiece(switch_value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+        for (const auto &piece : split) {
+            int port;
+            if (!base::StringToInt(piece, &port))
+                continue;
+            if (!net::IsPortValid(port))
+                continue;
+            explicitly_allowed_network_ports.push_back(static_cast<uint16_t>(port));
+        }
+
+        network_service->SetExplicitlyAllowedPorts(explicitly_allowed_network_ports);
+    }
     // Configure the stub resolver. This must be done after the system
     // NetworkContext is created, but before anything has the chance to use it.
     //    bool stub_resolver_enabled;
diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp
index 14ba5e8d9..2b28e29ce 100644
--- a/src/core/ozone/gl_ozone_egl_qt.cpp
+++ b/src/core/ozone/gl_ozone_egl_qt.cpp
@@ -65,7 +65,7 @@ base::NativeLibrary LoadLibrary(const base::FilePath& filename) {
     return library;
 }
 
-bool GLOzoneEGLQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/)
+bool GLOzoneEGLQt::LoadGLES2Bindings(const gl::GLImplementationParts & /*implementation*/)
 {
     base::NativeLibrary eglgles2Library = dlopen(NULL, RTLD_LAZY);
     if (!eglgles2Library) {
diff --git a/src/core/ozone/gl_ozone_egl_qt.h b/src/core/ozone/gl_ozone_egl_qt.h
index c55ba232c..c2515a416 100644
--- a/src/core/ozone/gl_ozone_egl_qt.h
+++ b/src/core/ozone/gl_ozone_egl_qt.h
@@ -61,7 +61,7 @@ protected:
     gl::EGLDisplayPlatform GetNativeDisplay() override;
 
     // Sets up GL bindings for the native surface.
-    bool LoadGLES2Bindings(gl::GLImplementation implementation) override;
+    bool LoadGLES2Bindings(const gl::GLImplementationParts &implementation) override;
 };
 
 } // namespace ui
diff --git a/src/core/ozone/gl_ozone_glx_qt.cpp b/src/core/ozone/gl_ozone_glx_qt.cpp
index 60b970209..19c24dcb6 100644
--- a/src/core/ozone/gl_ozone_glx_qt.cpp
+++ b/src/core/ozone/gl_ozone_glx_qt.cpp
@@ -61,7 +61,8 @@ bool GLOzoneGLXQt::InitializeGLOneOffPlatform() {
 }
 
 bool GLOzoneGLXQt::InitializeStaticGLBindings(
-        gl::GLImplementation implementation) {
+        const gl::GLImplementationParts &implementation) {
+    Q_UNUSED(implementation);
 
     base::NativeLibrary library = dlopen(NULL, RTLD_LAZY);
     if (!library) {
diff --git a/src/core/ozone/gl_ozone_glx_qt.h b/src/core/ozone/gl_ozone_glx_qt.h
index 7825cba35..f1bf8ac61 100644
--- a/src/core/ozone/gl_ozone_glx_qt.h
+++ b/src/core/ozone/gl_ozone_glx_qt.h
@@ -53,7 +53,7 @@ public:
     ~GLOzoneGLXQt() override {}
 
     bool InitializeGLOneOffPlatform() override;
-    bool InitializeStaticGLBindings(gl::GLImplementation implementation) override;
+    bool InitializeStaticGLBindings(const gl::GLImplementationParts &implementation) override;
     bool InitializeExtensionSettingsOneOffPlatform() override;
     void ShutdownGL() override;
     void SetDisabledExtensionsPlatform(
diff --git a/src/core/ozone/gl_surface_egl_qt.cpp b/src/core/ozone/gl_surface_egl_qt.cpp
index 849f0ee4d..8c8ae98a7 100644
--- a/src/core/ozone/gl_surface_egl_qt.cpp
+++ b/src/core/ozone/gl_surface_egl_qt.cpp
@@ -237,6 +237,11 @@ bool GLSurfaceEGL::IsAndroidNativeFenceSyncSupported()
      return false;
 }
 
+DisplayType GLSurfaceEGL::GetDisplayType()
+{
+     return DisplayType::DEFAULT;
+}
+
 GLSurfaceEGLQt::GLSurfaceEGLQt(const gfx::Size& size)
     : GLSurfaceQt(size),
       m_surfaceBuffer(0)
diff --git a/src/core/ozone/platform_window_qt.h b/src/core/ozone/platform_window_qt.h
index 15c1c3faf..c0dc8ccc3 100644
--- a/src/core/ozone/platform_window_qt.h
+++ b/src/core/ozone/platform_window_qt.h
@@ -62,7 +62,7 @@ public:
     void Hide() override { }
     void Close() override { }
     bool IsVisible() const override { return true; }
-    void SetTitle(const base::string16&) override { }
+    void SetTitle(const std::u16string&) override { }
     void SetCapture() override { }
     void ReleaseCapture() override { }
     bool HasCapture() const override { return false; }
diff --git a/src/core/ozone/surface_factory_qt.cpp b/src/core/ozone/surface_factory_qt.cpp
index 846d930d6..e2ffabe0e 100644
--- a/src/core/ozone/surface_factory_qt.cpp
+++ b/src/core/ozone/surface_factory_qt.cpp
@@ -69,7 +69,7 @@ std::vector<gl::GLImplementation> SurfaceFactoryQt::GetAllowedGLImplementations(
     return m_impl;
 }
 
-ui::GLOzone* SurfaceFactoryQt::GetGLOzone(gl::GLImplementation implementation)
+ui::GLOzone *SurfaceFactoryQt::GetGLOzone(const gl::GLImplementationParts &implementation)
 {
     return m_ozone.get();
 }
diff --git a/src/core/ozone/surface_factory_qt.h b/src/core/ozone/surface_factory_qt.h
index 232f11e0f..fa8331a78 100644
--- a/src/core/ozone/surface_factory_qt.h
+++ b/src/core/ozone/surface_factory_qt.h
@@ -51,7 +51,7 @@ class SurfaceFactoryQt : public ui::SurfaceFactoryOzone
 public:
     SurfaceFactoryQt();
     std::vector<gl::GLImplementation> GetAllowedGLImplementations() override;
-    ui::GLOzone* GetGLOzone(gl::GLImplementation implementation) override;
+    ui::GLOzone *GetGLOzone(const gl::GLImplementationParts &implementation) override;
 private:
     std::vector<gl::GLImplementation> m_impl;
     std::unique_ptr<ui::GLOzone> m_ozone;
diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp
index e6db004de..686e61216 100644
--- a/src/core/permission_manager_qt.cpp
+++ b/src/core/permission_manager_qt.cpp
@@ -89,6 +89,7 @@ static ProfileAdapter::PermissionType toQt(content::PermissionType type)
     case content::PermissionType::STORAGE_ACCESS_GRANT:
     case content::PermissionType::FONT_ACCESS:
     case content::PermissionType::DISPLAY_CAPTURE:
+    case content::PermissionType::FILE_HANDLING:
     case content::PermissionType::NUM:
         LOG(INFO) << "Unexpected unsupported permission type: " << static_cast<int>(type);
         break;
@@ -199,7 +200,7 @@ bool PermissionManagerQt::checkPermission(const QUrl &origin, ProfileAdapter::Pe
     return m_permissions.contains(key) && m_permissions[key];
 }
 
-int PermissionManagerQt::RequestPermission(content::PermissionType permission,
+void PermissionManagerQt::RequestPermission(content::PermissionType permission,
                                             content::RenderFrameHost *frameHost,
                                             const GURL& requesting_origin,
                                             bool /*user_gesture*/,
@@ -207,7 +208,7 @@ int PermissionManagerQt::RequestPermission(content::PermissionType permission,
 {
     if (requesting_origin.is_empty()) {
         std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
-        return content::PermissionController::kNoPendingOperation;
+        return;
     }
 
     WebContentsDelegateQt *contentsDelegate = static_cast<WebContentsDelegateQt *>(
@@ -222,28 +223,27 @@ int PermissionManagerQt::RequestPermission(content::PermissionType permission,
             std::move(callback).Run(blink::mojom::PermissionStatus::GRANTED);
         else
             std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
-        return content::PermissionController::kNoPendingOperation;
+        return;
     } else if (!canRequestPermissionFor(permissionType)) {
         std::move(callback).Run(blink::mojom::PermissionStatus::DENIED);
-        return content::PermissionController::kNoPendingOperation;
+        return;
     }
 
     int request_id = ++m_requestIdCount;
     auto requestOrigin = toQt(requesting_origin);
     m_requests.push_back({ request_id, permissionType, requestOrigin, std::move(callback) });
     contentsDelegate->requestFeaturePermission(permissionType, requestOrigin);
-    return request_id;
 }
 
-int PermissionManagerQt::RequestPermissions(const std::vector<content::PermissionType>& permissions,
-                                            content::RenderFrameHost* frameHost,
-                                            const GURL& requesting_origin,
-                                            bool /*user_gesture*/,
-                                            base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus>&)> callback)
+void PermissionManagerQt::RequestPermissions(const std::vector<content::PermissionType> &permissions,
+                                             content::RenderFrameHost *frameHost,
+                                             const GURL &requesting_origin,
+                                             bool /*user_gesture*/,
+                                             base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus> &)> callback)
 {
     if (requesting_origin.is_empty()) {
         std::move(callback).Run(std::vector<blink::mojom::PermissionStatus>(permissions.size(), blink::mojom::PermissionStatus::DENIED));
-        return content::PermissionController::kNoPendingOperation;
+        return;
     }
 
     WebContentsDelegateQt *contentsDelegate = static_cast<WebContentsDelegateQt *>(
@@ -271,7 +271,7 @@ int PermissionManagerQt::RequestPermissions(const std::vector<content::Permissio
     }
     if (answerable) {
         std::move(callback).Run(result);
-        return content::PermissionController::kNoPendingOperation;
+        return;
     }
 
     int request_id = ++m_requestIdCount;
@@ -282,7 +282,6 @@ int PermissionManagerQt::RequestPermissions(const std::vector<content::Permissio
         if (canRequestPermissionFor(permissionType))
             contentsDelegate->requestFeaturePermission(permissionType, requestOrigin);
     }
-    return request_id;
 }
 
 blink::mojom::PermissionStatus PermissionManagerQt::GetPermissionStatus(
diff --git a/src/core/permission_manager_qt.h b/src/core/permission_manager_qt.h
index f8d7e0ee3..8cecfdf7b 100644
--- a/src/core/permission_manager_qt.h
+++ b/src/core/permission_manager_qt.h
@@ -59,7 +59,7 @@ public:
     bool checkPermission(const QUrl &origin, ProfileAdapter::PermissionType type);
 
     // content::PermissionManager implementation:
-    int RequestPermission(
+    void RequestPermission(
         content::PermissionType permission,
         content::RenderFrameHost* render_frame_host,
         const GURL& requesting_origin,
@@ -81,7 +81,7 @@ public:
         const GURL& requesting_origin,
         const GURL& embedding_origin) override;
 
-    int RequestPermissions(
+    void RequestPermissions(
         const std::vector<content::PermissionType>& permission,
         content::RenderFrameHost* render_frame_host,
         const GURL& requesting_origin,
diff --git a/src/core/printing/print_view_manager_base_qt.cpp b/src/core/printing/print_view_manager_base_qt.cpp
index 8d2d1bfd6..5bed60183 100644
--- a/src/core/printing/print_view_manager_base_qt.cpp
+++ b/src/core/printing/print_view_manager_base_qt.cpp
@@ -303,7 +303,7 @@ void PrintViewManagerBaseQt::NavigationStopped()
     TerminatePrintJob(true);
 }
 
-base::string16 PrintViewManagerBaseQt::RenderSourceName()
+std::u16string PrintViewManagerBaseQt::RenderSourceName()
 {
      return toString16(QLatin1String(""));
 }
diff --git a/src/core/printing/print_view_manager_base_qt.h b/src/core/printing/print_view_manager_base_qt.h
index 21069af67..e6624e5cd 100644
--- a/src/core/printing/print_view_manager_base_qt.h
+++ b/src/core/printing/print_view_manager_base_qt.h
@@ -45,7 +45,6 @@
 #define PRINT_VIEW_MANAGER_BASE_QT_H
 
 #include "base/memory/ref_counted_memory.h"
-#include "base/strings/string16.h"
 #include "components/prefs/pref_member.h"
 #include "components/printing/browser/print_manager.h"
 #include "components/printing/common/print.mojom-forward.h"
@@ -77,7 +76,7 @@ public:
     // Whether printing is enabled or not.
     void UpdatePrintingEnabled();
 
-    base::string16 RenderSourceName();
+    std::u16string RenderSourceName();
 
     // mojom::PrintManagerHost:
     void DidGetPrintedPagesCount(int32_t cookie, uint32_t number_pages) override;
diff --git a/src/core/printing/print_view_manager_qt.cpp b/src/core/printing/print_view_manager_qt.cpp
index 3b66ad29d..250a80f3c 100644
--- a/src/core/printing/print_view_manager_qt.cpp
+++ b/src/core/printing/print_view_manager_qt.cpp
@@ -56,6 +56,7 @@
 #include "base/values.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/task/post_task.h"
+#include "base/task/thread_pool.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "components/printing/common/print.mojom.h"
@@ -394,8 +395,8 @@ void PrintViewManagerQt::MetafileReadyForPrinting(printing::mojom::DidPreviewDoc
                        base::BindOnce(pdf_print_callback, data_array));
     } else {
         scoped_refptr<base::RefCountedBytes> data_bytes = GetBytesFromHandle(params->content->metafile_data_region);
-        base::PostTask(FROM_HERE, {base::ThreadPool(), base::MayBlock()},
-                       base::BindOnce(&SavePdfFile, data_bytes, pdfOutputPath, pdf_save_callback));
+        base::ThreadPool::PostTask(FROM_HERE, { base::MayBlock() },
+                                   base::BindOnce(&SavePdfFile, data_bytes, pdfOutputPath, pdf_save_callback));
     }
 }
 
diff --git a/src/core/printing/print_view_manager_qt.h b/src/core/printing/print_view_manager_qt.h
index 0496a9ba7..893161464 100644
--- a/src/core/printing/print_view_manager_qt.h
+++ b/src/core/printing/print_view_manager_qt.h
@@ -49,7 +49,6 @@
 #include "qtwebenginecoreglobal_p.h"
 
 #include "base/memory/ref_counted.h"
-#include "base/strings/string16.h"
 #include "components/prefs/pref_member.h"
 #include "components/printing/common/print.mojom.h"
 #include "content/public/browser/web_contents_user_data.h"
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp
index bc256bb08..f235cdb57 100644
--- a/src/core/profile_io_data_qt.cpp
+++ b/src/core/profile_io_data_qt.cpp
@@ -270,7 +270,7 @@ void ProfileIODataQt::ConfigureNetworkContextParams(bool in_memory,
 
     // Should be initialized with existing per-profile CORS access lists.
     network_context_params->cors_origin_access_list =
-        m_profile->GetSharedCorsOriginAccessList()->GetOriginAccessList().CreateCorsOriginAccessPatternsList();
+        content::BrowserContext::GetSharedCorsOriginAccessList(m_profile)->GetOriginAccessList().CreateCorsOriginAccessPatternsList();
 
     m_proxyConfigMonitor->AddToNetworkContextParams(network_context_params);
 }
diff --git a/src/core/profile_qt.cpp b/src/core/profile_qt.cpp
index ec7da1406..ae210b6c8 100644
--- a/src/core/profile_qt.cpp
+++ b/src/core/profile_qt.cpp
@@ -87,8 +87,7 @@
 namespace QtWebEngineCore {
 
 ProfileQt::ProfileQt(ProfileAdapter *profileAdapter)
-    : m_sharedCorsOriginAccessList(content::SharedCorsOriginAccessList::Create())
-    , m_profileIOData(new ProfileIODataQt(this))
+    : m_profileIOData(new ProfileIODataQt(this))
     , m_profileAdapter(profileAdapter)
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     , m_extensionSystem(nullptr)
@@ -220,35 +219,6 @@ content::StorageNotificationService *ProfileQt::GetStorageNotificationService()
     return nullptr;
 }
 
-void ProfileQt::SetCorsOriginAccessListForOrigin(TargetBrowserContexts target_mode,
-                                                 const url::Origin &source_origin,
-                                                 std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
-                                                 std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
-                                                 base::OnceClosure closure)
-{
-    Q_UNUSED(target_mode); // We have no related OTR profiles
-
-    auto barrier_closure = base::BarrierClosure(2, std::move(closure));
-
-    // Keep profile storage partitions' NetworkContexts synchronized.
-    auto profile_setter = base::MakeRefCounted<content::CorsOriginPatternSetter>(
-                source_origin,
-                content::CorsOriginPatternSetter::ClonePatterns(allow_patterns),
-                content::CorsOriginPatternSetter::ClonePatterns(block_patterns),
-                barrier_closure);
-    profile_setter->ApplyToEachStoragePartition(this);
-
-    m_sharedCorsOriginAccessList->SetForOrigin(source_origin,
-                                               std::move(allow_patterns),
-                                               std::move(block_patterns),
-                                               barrier_closure);
-}
-
-content::SharedCorsOriginAccessList *ProfileQt::GetSharedCorsOriginAccessList()
-{
-    return m_sharedCorsOriginAccessList.get();
-}
-
 #if QT_CONFIG(webengine_spellchecker)
 void ProfileQt::FailedToLoadDictionary(const std::string &language)
 {
diff --git a/src/core/profile_qt.h b/src/core/profile_qt.h
index 8ad1922df..61453e426 100644
--- a/src/core/profile_qt.h
+++ b/src/core/profile_qt.h
@@ -89,13 +89,6 @@ public:
     content::BrowsingDataRemoverDelegate *GetBrowsingDataRemoverDelegate() override;
     content::ClientHintsControllerDelegate *GetClientHintsControllerDelegate() override;
     content::StorageNotificationService *GetStorageNotificationService() override;
-    void SetCorsOriginAccessListForOrigin(TargetBrowserContexts target_mode,
-                                          const url::Origin &source_origin,
-                                          std::vector<network::mojom::CorsOriginPatternPtr> allow_patterns,
-                                          std::vector<network::mojom::CorsOriginPatternPtr> block_patterns,
-                                          base::OnceClosure closure) override;
-
-    content::SharedCorsOriginAccessList *GetSharedCorsOriginAccessList() override;
     std::string GetMediaDeviceIDSalt() override;
 
     // Profile implementation:
@@ -127,7 +120,6 @@ private:
     std::unique_ptr<BrowsingDataRemoverDelegateQt> m_removerDelegate;
     std::unique_ptr<PermissionManagerQt> m_permissionManager;
     std::unique_ptr<SSLHostStateDelegateQt> m_sslHostStateDelegate;
-    scoped_refptr<content::SharedCorsOriginAccessList> m_sharedCorsOriginAccessList;
     std::unique_ptr<ProfileIODataQt> m_profileIOData;
     std::unique_ptr<content::PlatformNotificationService> m_platformNotificationService;
     ProfileAdapter *m_profileAdapter;
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 9d5744cbf..4e2ab2ea9 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -664,12 +664,12 @@ void RenderWidgetHostViewQt::Destroy()
     delete this;
 }
 
-void RenderWidgetHostViewQt::SetTooltipText(const base::string16 &tooltip_text)
+void RenderWidgetHostViewQt::SetTooltipText(const std::u16string &tooltip_text)
 {
     DisplayTooltipText(tooltip_text);
 }
 
-void RenderWidgetHostViewQt::DisplayTooltipText(const base::string16 &tooltip_text)
+void RenderWidgetHostViewQt::DisplayTooltipText(const std::u16string &tooltip_text)
 {
     if (host()->delegate() && m_adapterClient)
         m_adapterClient->setToolTip(toQt(tooltip_text));
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 15ef4fa2a..73ec729a4 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -125,8 +125,8 @@ public:
                                            content::RenderWidgetHostViewBase *target_view,
                                            gfx::PointF *transformed_point) override;
     void Destroy() override;
-    void SetTooltipText(const base::string16 &tooltip_text) override;
-    void DisplayTooltipText(const base::string16& tooltip_text) override;
+    void SetTooltipText(const std::u16string &tooltip_text) override;
+    void DisplayTooltipText(const std::u16string& tooltip_text) override;
     void WheelEventAck(const blink::WebMouseWheelEvent &event,
                        blink::mojom::InputEventResultState ack_result) override;
     void GestureEventAck(const blink::WebGestureEvent &event,
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index f52c17dcf..aac6fc430 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -262,7 +262,8 @@ void ContentRendererClientQt::PrepareErrorPage(content::RenderFrame *renderFrame
 {
     GetNavigationErrorStringsInternal(
             renderFrame, httpMethod,
-            error_page::Error::NetError((GURL)web_error.url(), web_error.reason(), net::ResolveErrorInfo(), web_error.has_copy_in_cache()),
+            error_page::Error::NetError((GURL)web_error.url(), web_error.reason(), web_error.extended_reason(),
+                                        net::ResolveErrorInfo(), web_error.has_copy_in_cache()),
             errorHtml);
 }
 
@@ -297,7 +298,7 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF
                 error_page::LocalizedError::GetPageState(
                         error.reason(), error.domain(), error.url(), isPost, false,
                         error.stale_copy_in_cache(), false,
-                        RenderConfiguration::is_incognito_process(), false, false, false, locale);
+                        RenderConfiguration::is_incognito_process(), false, false, false, locale, false);
 
         resourceId = IDR_NET_ERROR_HTML;
 
@@ -566,7 +567,6 @@ static void AddWidevine(std::vector<std::unique_ptr<media::KeySystemProperties>>
     }
 
     auto persistent_license_support = media::EmeSessionTypeSupport::NOT_SUPPORTED;
-    auto persistent_usage_record_support = media::EmeSessionTypeSupport::NOT_SUPPORTED;
 
     // Others.
     auto persistent_state_support = media::EmeFeatureSupport::REQUESTABLE;
@@ -575,8 +575,8 @@ static void AddWidevine(std::vector<std::unique_ptr<media::KeySystemProperties>>
     concrete_key_systems->emplace_back(new cdm::WidevineKeySystemProperties(
                                            codecs, encryption_schemes, hw_secure_codecs,
                                            hw_secure_encryption_schemes, max_audio_robustness, max_video_robustness,
-                                           persistent_license_support, persistent_usage_record_support,
-                                           persistent_state_support, distinctive_identifier_support));
+                                           persistent_license_support, persistent_state_support,
+                                           distinctive_identifier_support));
 }
 #endif // BUILDFLAG(ENABLE_WIDEVINE)
 #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
diff --git a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp
index f3604d1ec..15f3e9eff 100644
--- a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp
+++ b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp
@@ -61,7 +61,7 @@ gin::WrapperInfo LoadablePluginPlaceholderQt::kWrapperInfo = {gin::kEmbedderNati
 LoadablePluginPlaceholderQt::LoadablePluginPlaceholderQt(content::RenderFrame* render_frame,
                                                          const blink::WebPluginParams& params,
                                                          const std::string& html_data,
-                                                         const base::string16& title)
+                                                         const std::u16string& title)
     : plugins::LoadablePluginPlaceholder(render_frame, params, html_data)
 {}
 
diff --git a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h
index 4c3b7ec88..f612cb8ec 100644
--- a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h
+++ b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.h
@@ -63,7 +63,7 @@ private:
     LoadablePluginPlaceholderQt(content::RenderFrame* render_frame,
                                 const blink::WebPluginParams& params,
                                 const std::string& html_data,
-                                const base::string16& title);
+                                const std::u16string& title);
     ~LoadablePluginPlaceholderQt() override;
 
     // content::LoadablePluginPlaceholder overrides.
diff --git a/src/core/select_file_dialog_factory_qt.cpp b/src/core/select_file_dialog_factory_qt.cpp
index baad07b24..8fe0a0be5 100644
--- a/src/core/select_file_dialog_factory_qt.cpp
+++ b/src/core/select_file_dialog_factory_qt.cpp
@@ -98,7 +98,7 @@ public:
     // ui::SelectFileDialog implementation:
     bool IsRunning(gfx::NativeWindow) const override;
     void ListenerDestroyed() override;
-    void SelectFileImpl(Type type, const base::string16 &title, const base::FilePath &default_path,
+    void SelectFileImpl(Type type, const std::u16string &title, const base::FilePath &default_path,
                         const FileTypeInfo *file_types, int file_type_index,
                         const base::FilePath::StringType &default_extension,
                         gfx::NativeWindow owning_window, void *params) override;
@@ -139,7 +139,7 @@ extern FilePickerController *createFilePickerController(FilePickerController::Fi
                                                         const QStringList &acceptedMimeTypes,
                                                         QObject *parent = nullptr);
 
-void SelectFileDialogQt::SelectFileImpl(Type type, const base::string16 &title,
+void SelectFileDialogQt::SelectFileImpl(Type type, const std::u16string &title,
                                         const base::FilePath &default_path,
                                         const FileTypeInfo *file_types, int file_type_index,
                                         const base::FilePath::StringType &default_extension,
diff --git a/src/core/tools/main.cpp b/src/core/tools/main.cpp
index a977fc22d..7d3515a82 100644
--- a/src/core/tools/main.cpp
+++ b/src/core/tools/main.cpp
@@ -48,7 +48,7 @@ inline base::FilePath toFilePath(const QString &str)
     return base::FilePath(toFilePathString(str));
 }
 
-inline QString toQt(const base::string16 &string)
+inline QString toQt(const std::u16string &string)
 {
 #if defined(OS_WIN)
     return QString::fromStdWString(string);
diff --git a/src/core/touch_selection_controller_client_qt.h b/src/core/touch_selection_controller_client_qt.h
index 02febd9bf..16d581ba8 100644
--- a/src/core/touch_selection_controller_client_qt.h
+++ b/src/core/touch_selection_controller_client_qt.h
@@ -74,7 +74,7 @@ public:
     void ExecuteCommand(int command_id, int event_flags) override;
     void RunContextMenu() override;
     bool ShouldShowQuickMenu() override { return false; }
-    base::string16 GetSelectedText() override { return base::string16(); }
+    std::u16string GetSelectedText() override { return std::u16string(); }
 
     // content::TouchSelectionControllerClientManager overrides
     void DidStopFlinging() override;
diff --git a/src/core/type_conversion.h b/src/core/type_conversion.h
index 9bf0416a9..c9f2b1473 100644
--- a/src/core/type_conversion.h
+++ b/src/core/type_conversion.h
@@ -49,7 +49,6 @@
 #include <QRect>
 #include <QString>
 #include <QUrl>
-#include <base/strings/nullable_string16.h>
 #include "base/files/file_path.h"
 #include "base/time/time.h"
 #include "net/cookies/canonical_cookie.h"
@@ -77,7 +76,7 @@ class X509Certificate;
 
 namespace QtWebEngineCore {
 
-inline QString toQt(const base::string16 &string)
+inline QString toQt(const std::u16string &string)
 {
 #if defined(OS_WIN)
     return QString::fromStdWString(string);
@@ -86,7 +85,7 @@ inline QString toQt(const base::string16 &string)
 #endif
 }
 
-inline QString toQt(const base::Optional<base::string16> &string)
+inline QString toQt(const base::Optional<std::u16string> &string)
 {
     if (!string.has_value())
         return QString();
@@ -113,21 +112,16 @@ inline QString toQt(const std::string &string)
     return toQString(string);
 }
 
-inline base::string16 toString16(const QString &qString)
+inline std::u16string toString16(const QString &qString)
 {
 #if defined(OS_WIN)
-    return base::string16(qString.toStdWString());
+    return std::u16string(qString.toStdWString());
 #else
-    return base::string16((const char16_t *)qString.utf16());
+    return std::u16string((const char16_t *)qString.utf16());
 #endif
 }
 
-inline base::NullableString16 toNullableString16(const QString &qString)
-{
-    return base::NullableString16(toString16(qString), qString.isNull());
-}
-
-inline base::Optional<base::string16> toOptionalString16(const QString &qString)
+inline base::Optional<std::u16string> toOptionalString16(const QString &qString)
 {
     if (qString.isNull())
         return base::nullopt;
@@ -264,7 +258,7 @@ inline base::FilePath toFilePath(const QString &str)
 
 int flagsFromModifiers(Qt::KeyboardModifiers modifiers);
 
-inline QStringList fromVector(const std::vector<base::string16> &vector)
+inline QStringList fromVector(const std::vector<std::u16string> &vector)
 {
     QStringList result;
     for (auto s: vector) {
diff --git a/src/core/user_script.cpp b/src/core/user_script.cpp
index 1c8a78cd3..c66d0bddf 100644
--- a/src/core/user_script.cpp
+++ b/src/core/user_script.cpp
@@ -37,6 +37,8 @@
 **
 ****************************************************************************/
 
+#include "base/strings/string_util.h"
+
 #include "qtwebengine/userscript/user_script_data.h"
 #include "user_script.h"
 #include "type_conversion.h"
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 0a83b248f..763564ad1 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -165,7 +165,7 @@ static QVariant fromJSValue(const base::Value *result)
     }
     case base::Value::Type::STRING:
     {
-        base::string16 out;
+        std::u16string out;
         if (result->GetAsString(&out))
             ret.setValue(toQt(out));
         break;
@@ -1552,7 +1552,8 @@ void WebContentsAdapter::startDragging(QObject *dragSource, const content::DropD
             if (rvh) {
                 rvh->GetWidget()->DragSourceEndedAt(gfx::PointF(m_lastDragClientPos.x(), m_lastDragClientPos.y()),
                                                     gfx::PointF(m_lastDragScreenPos.x(), m_lastDragScreenPos.y()),
-                                                    ui::mojom::DragOperation(m_currentDropAction));
+                                                    ui::mojom::DragOperation(m_currentDropAction),
+                                                    base::DoNothing());
                 rvh->GetWidget()->DragSourceSystemDragEnded();
             }
         }
@@ -1664,7 +1665,8 @@ void WebContentsAdapter::enterDrag(QDragEnterEvent *e, const QPointF &screenPos)
     rvh->GetWidget()->FilterDropData(m_currentDropData.get());
     rvh->GetWidget()->DragTargetDragEnter(*m_currentDropData, toGfx(e->position()), toGfx(screenPos),
                                           toWeb(e->possibleActions()),
-                                          toWeb(e->buttons()) | toWeb(e->modifiers()));
+                                          toWeb(e->buttons()) | toWeb(e->modifiers()),
+                                          base::DoNothing());
 }
 
 Qt::DropAction WebContentsAdapter::updateDragPosition(QDragMoveEvent *e, const QPointF &screenPos)
@@ -1674,7 +1676,7 @@ Qt::DropAction WebContentsAdapter::updateDragPosition(QDragMoveEvent *e, const Q
     m_lastDragClientPos = e->position();
     m_lastDragScreenPos = screenPos;
     rvh->GetWidget()->DragTargetDragOver(toGfx(m_lastDragClientPos), toGfx(m_lastDragScreenPos), toWeb(e->possibleActions()),
-                                         toWeb(e->buttons()) | toWeb(e->modifiers()));
+                                         toWeb(e->buttons()) | toWeb(e->modifiers()), base::DoNothing());
     waitForUpdateDragActionCalled();
     return toQt(ui::mojom::DragOperation(m_currentDropAction));
 }
@@ -1720,7 +1722,7 @@ void WebContentsAdapter::endDragging(QDropEvent *e, const QPointF &screenPos)
     m_lastDragClientPos = e->position();
     m_lastDragScreenPos = screenPos;
     rvh->GetWidget()->DragTargetDrop(*m_currentDropData, toGfx(m_lastDragClientPos), toGfx(m_lastDragScreenPos),
-                                     toWeb(e->buttons()) | toWeb(e->modifiers()));
+                                     toWeb(e->buttons()) | toWeb(e->modifiers()), base::DoNothing());
 
     m_currentDropData.reset();
 }
@@ -1764,7 +1766,7 @@ void WebContentsAdapter::resetSelection()
     if (auto rwhv = static_cast<RenderWidgetHostViewQt *>(m_webContents->GetRenderWidgetHostView())) {
         if (auto mgr = rwhv->GetTextInputManager())
             if (auto selection = const_cast<content::TextInputManager::TextSelection *>(mgr->GetTextSelection(rwhv)))
-                selection->SetSelection(base::string16(), 0, gfx::Range(), false);
+                selection->SetSelection(std::u16string(), 0, gfx::Range(), false);
     }
 }
 
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index ef79c8f47..3adffd1ab 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -513,7 +513,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
         return;
     }
     // Qt6: Consider getting rid of the error_description (Chromium already has)
-    base::string16 error_description;
+    std::u16string error_description;
     error_description = error_page::LocalizedError::GetErrorDetails(
                 error_code <= 0 ? error_page::Error::kNetErrorDomain : error_page::Error::kHttpErrorDomain,
                 error_code, false, false);
@@ -603,7 +603,7 @@ void WebContentsDelegateQt::RunFileChooser(content::RenderFrameHost * /*frameHos
 {
     QStringList acceptedMimeTypes;
     acceptedMimeTypes.reserve(params.accept_types.size());
-    for (std::vector<base::string16>::const_iterator it = params.accept_types.begin(); it < params.accept_types.end(); ++it)
+    for (std::vector<std::u16string>::const_iterator it = params.accept_types.begin(); it < params.accept_types.end(); ++it)
         acceptedMimeTypes.append(toQt(*it));
 
     m_filePickerController.reset(createFilePickerController(static_cast<FilePickerController::FileChooserMode>(params.mode),
@@ -616,7 +616,7 @@ void WebContentsDelegateQt::RunFileChooser(content::RenderFrameHost * /*frameHos
 }
 
 bool WebContentsDelegateQt::DidAddMessageToConsole(content::WebContents *source, blink::mojom::ConsoleMessageLevel log_level,
-                                                   const base::string16 &message, int32_t line_no, const base::string16 &source_id)
+                                                   const std::u16string &message, int32_t line_no, const std::u16string &source_id)
 {
     Q_UNUSED(source);
     m_viewClient->javaScriptConsoleMessage(mapToJavascriptConsoleMessageLevel(log_level), toQt(message), static_cast<int>(line_no), toQt(source_id));
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index 4704f78fb..fc51f4e37 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -137,7 +137,7 @@ public:
                         scoped_refptr<content::FileSelectListener> listener,
                         const blink::mojom::FileChooserParams& params) override;
     bool DidAddMessageToConsole(content::WebContents *source, blink::mojom::ConsoleMessageLevel log_level,
-                                const base::string16 &message, int32_t line_no, const base::string16 &source_id) override;
+                                const std::u16string &message, int32_t line_no, const std::u16string &source_id) override;
     void FindReply(content::WebContents *source, int request_id, int number_of_matches, const gfx::Rect& selection_rect, int active_match_ordinal, bool final_update) override;
     void RequestMediaAccessPermission(content::WebContents *web_contents,
                                       const content::MediaStreamRequest &request,
diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h
index 8b59fc34b..32fcef69a 100644
--- a/src/core/web_contents_view_qt.h
+++ b/src/core/web_contents_view_qt.h
@@ -78,7 +78,7 @@ public:
 
     content::RenderWidgetHostViewBase *CreateViewForChildWidget(content::RenderWidgetHost* render_widget_host) override;
 
-    void SetPageTitle(const base::string16& title) override { }
+    void SetPageTitle(const std::u16string& title) override { }
 
     void RenderViewReady() override { }
 
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 41aed57e2..fb1fe710d 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -828,11 +828,6 @@ WebEngineContext::WebEngineContext()
 
     base::ThreadRestrictions::SetIOAllowed(true);
 
-    if (parsedCommandLine->HasSwitch(network::switches::kExplicitlyAllowedPorts)) {
-        std::string allowedPorts = parsedCommandLine->GetSwitchValueASCII(network::switches::kExplicitlyAllowedPorts);
-        net::SetExplicitlyAllowedPorts(allowedPorts);
-    }
-
 #if defined(OS_LINUX)
     media::AudioManager::SetGlobalAppName(QCoreApplication::applicationName().toStdString());
 #endif
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index 6b11cf0cd..8f580e53a 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -347,7 +347,7 @@ base::FilePath WebEngineLibraryInfo::getPath(int key)
     return toFilePath(directory.isEmpty() ? fallbackDir() : directory);
 }
 
-base::string16 WebEngineLibraryInfo::getApplicationName()
+std::u16string WebEngineLibraryInfo::getApplicationName()
 {
     return toString16(qApp->applicationName());
 }
diff --git a/src/core/web_engine_library_info.h b/src/core/web_engine_library_info.h
index e7dc195f6..2926365bf 100644
--- a/src/core/web_engine_library_info.h
+++ b/src/core/web_engine_library_info.h
@@ -42,7 +42,6 @@
 #define WEB_ENGINE_LIBRARY_INFO_H
 
 #include "base/files/file_path.h"
-#include "base/strings/string16.h"
 #include <QString>
 
 enum {
@@ -56,7 +55,7 @@ class WebEngineLibraryInfo {
 public:
     static base::FilePath getPath(int key);
     // Called by localized_error in our custom chrome layer
-    static base::string16 getApplicationName();
+    static std::u16string getApplicationName();
     static std::string getResolvedLocale();
     static std::string getApplicationLocale();
 #if defined(OS_WIN)