1 files changed, 36 insertions, 15 deletions

diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 6b2487944..b2761b311 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -40,11 +40,9 @@
 #ifndef CONTENT_BROWSER_CLIENT_QT_H
 #define CONTENT_BROWSER_CLIENT_QT_H
 
+#include "qtwebenginecoreglobal_p.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/content_browser_client.h"
-#include "ppapi/features/features.h"
-
-#include <QtGlobal>
 
 namespace net {
 class URLRequestContextGetter;
@@ -54,7 +52,7 @@ namespace content {
 class BrowserContext;
 class BrowserMainParts;
 
-#if BUILDFLAG(ENABLE_PLUGINS)
+#if QT_CONFIG(webengine_pepper_plugins)
 class BrowserPpapiHost;
 #endif
 
@@ -63,6 +61,7 @@ class RenderFrameHost;
 class RenderProcessHost;
 class RenderViewHostDelegateView;
 class ResourceContext;
+class ResourceDispatcherHostDelegate;
 class WebContentsViewPort;
 class WebContents;
 struct MainFunctionParams;
@@ -74,9 +73,9 @@ class GLShareGroup;
 }
 
 namespace QtWebEngineCore {
-class BrowserContextQt;
+
 class BrowserMainPartsQt;
-class ResourceDispatcherHostDelegateQt;
+class ProfileQt;
 class ShareGroupQtQuick;
 
 class ContentBrowserClientQt : public content::ContentBrowserClient {
@@ -84,9 +83,9 @@ class ContentBrowserClientQt : public content::ContentBrowserClient {
 public:
     ContentBrowserClientQt();
     ~ContentBrowserClientQt();
-    static ContentBrowserClientQt* Get();
     content::BrowserMainParts* CreateBrowserMainParts(const content::MainFunctionParams&) override;
-    void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
+    void RenderProcessWillLaunch(content::RenderProcessHost *host,
+                                 service_manager::mojom::ServiceRequest* service_request) override;
     void ResourceDispatcherHostCreated() override;
     gl::GLShareGroup* GetInProcessGpuShareGroup() override;
     content::MediaObserver* GetMediaObserver() override;
@@ -107,19 +106,20 @@ public:
                                          net::SSLCertRequestInfo* cert_request_info,
                                          net::ClientCertIdentityList client_certs,
                                          std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
+    std::unique_ptr<net::ClientCertStore> CreateClientCertStore(content::ResourceContext *resource_context) override;
     content::DevToolsManagerDelegate *GetDevToolsManagerDelegate() override;
 
     std::string GetApplicationLocale() override;
     std::string GetAcceptLangs(content::BrowserContext* context) override;
     void AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id) override;
-    void GetAdditionalViewSourceSchemes(std::vector<std::string>* additional_schemes) override;
     void GetAdditionalWebUISchemes(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 RegisterInProcessServices(StaticServiceMap* services) override;
+    void RegisterInProcessServices(StaticServiceMap* services, content::ServiceManagerConnection* connection) override;
     void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
+    std::vector<ServiceManifestInfo> GetExtraServiceManifests() override;
     std::unique_ptr<base::Value> GetServiceManifestOverlay(base::StringPiece name) override;
     bool CanCreateWindow(
         content::RenderFrameHost* opener,
@@ -148,8 +148,7 @@ public:
                         const net::CanonicalCookie& cookie,
                         content::ResourceContext* context,
                         int render_process_id,
-                        int render_frame_id,
-                        const net::CookieOptions& options) override;
+                        int render_frame_id) override;
 
     bool AllowAppCache(const GURL& manifest_url,
                        const GURL& first_party,
@@ -170,20 +169,42 @@ public:
                               content::ResourceContext *context,
                               const std::vector<std::pair<int, int> > &render_frames) override;
 
+#if QT_CONFIG(webengine_geolocation)
     std::unique_ptr<device::LocationProvider> OverrideSystemLocationProvider() override;
-    void GetGeolocationRequestContext(base::OnceCallback<void(scoped_refptr<net::URLRequestContextGetter>)> callback) override;
+#endif
+
 #if defined(Q_OS_LINUX)
     void GetAdditionalMappedFilesForChildProcess(const base::CommandLine& command_line, int child_process_id, content::PosixFileDescriptorInfo* mappings) override;
 #endif
 
-#if BUILDFLAG(ENABLE_PLUGINS)
+#if QT_CONFIG(webengine_pepper_plugins)
     void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
 #endif
 
+    scoped_refptr<content::LoginDelegate> CreateLoginDelegate(
+            net::AuthChallengeInfo *auth_info,
+            content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
+            const content::GlobalRequestID &request_id,
+            bool is_main_frame,
+            const GURL &url,
+            scoped_refptr<net::HttpResponseHeaders> response_headers,
+            bool first_auth_attempt,
+            LoginAuthRequiredCallback auth_required_callback) override;
+    bool HandleExternalProtocol(
+            const GURL &url,
+            content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
+            int child_id,
+            content::NavigationUIData  *navigation_data,
+            bool is_main_frame,
+            ui::PageTransition page_transition,
+            bool has_user_gesture) override;
+
 private:
     void InitFrameInterfaces();
+    void AddNetworkHintsMessageFilter(int render_process_id, net::URLRequestContext *context);
+
     BrowserMainPartsQt* m_browserMainParts;
-    std::unique_ptr<ResourceDispatcherHostDelegateQt> m_resourceDispatcherHostDelegate;
+    std::unique_ptr<content::ResourceDispatcherHostDelegate> m_resourceDispatcherHostDelegate;
     scoped_refptr<ShareGroupQtQuick> m_shareGroupQtQuick;
     std::unique_ptr<service_manager::BinderRegistry> m_frameInterfaces;
     std::unique_ptr<service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>> m_frameInterfacesParameterized;