1 files changed, 21 insertions, 17 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 8e4ec3c9b..0b1c134cc 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -120,24 +120,23 @@ public:
     void BindInterfaceRequestFromFrame(content::RenderFrameHost* render_frame_host,
                                        const std::string& interface_name,
                                        mojo::ScopedMessagePipeHandle interface_pipe) override;
-    void RegisterInProcessServices(StaticServiceMap* services, content::ServiceManagerConnection* connection) override;
+    void RegisterIOThreadServiceHandlers(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,
-        const GURL& opener_url,
-        const GURL& opener_top_level_frame_url,
-        const GURL& source_origin,
-        content::mojom::WindowContainerType container_type,
-        const GURL& target_url,
-        const content::Referrer& referrer,
-        const std::string& frame_name,
-        WindowOpenDisposition disposition,
-        const blink::mojom::WindowFeatures& features,
-        bool user_gesture,
-        bool opener_suppressed,
-        bool* no_javascript_access) override;
+    std::vector<service_manager::Manifest> GetExtraServiceManifests() override;
+    base::Optional<service_manager::Manifest> GetServiceManifestOverlay(base::StringPiece name) override;
+    bool CanCreateWindow(content::RenderFrameHost *opener,
+                         const GURL &opener_url,
+                         const GURL &opener_top_level_frame_url,
+                         const url::Origin &source_origin,
+                         content::mojom::WindowContainerType container_type,
+                         const GURL &target_url,
+                         const content::Referrer &referrer,
+                         const std::string &frame_name,
+                         WindowOpenDisposition disposition,
+                         const blink::mojom::WindowFeatures &features,
+                         bool user_gesture,
+                         bool opener_suppressed,
+                         bool *no_javascript_access) override;
     bool ShouldEnableStrictSiteIsolation() override;
 
     bool AllowGetCookie(const GURL& url,
@@ -206,6 +205,11 @@ public:
             const std::string &method,
             const net::HttpRequestHeaders &headers) override;
 
+    static std::string getUserAgent();
+
+    std::string GetUserAgent() const override { return getUserAgent(); }
+    std::string GetProduct() const override;
+
 private:
     void InitFrameInterfaces();
     void AddNetworkHintsMessageFilter(int render_process_id, net::URLRequestContext *context);