Move interface registration to OnConnect in RPH

content/public/browser/content_browser_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 42 matching lines @@
 }
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace media {
 class CdmFactory;
 }
 
-namespace shell {
-class InterfaceRegistry;
-class Service;
-}
-
 namespace net {
 class CookieOptions;
 class NetLog;
 class SSLCertRequestInfo;
 class SSLInfo;
 class URLRequest;
 class URLRequestContext;
 class URLRequestContextGetter;
 class X509Certificate;
 }
 
 namespace sandbox {
 class TargetPolicy;
 }
 
+namespace shell {
+class Connection;
+class InterfaceRegistry;
+class Service;
+}
+
 namespace ui {
 class SelectFilePolicy;
 }
 
 namespace url {
 class Origin;
 }
 
 namespace storage {
 class ExternalMountPoints;
@@ skipping 546 matching lines @@
   // Returns true if dev channel APIs are available for plugins.
   virtual bool IsPluginAllowedToUseDevChannelAPIs(
       BrowserContext* browser_context,
       const GURL& url);
 
   // Generate a Shell user-id for the supplied browser context. Defaults to
   // returning a random GUID.
   virtual std::string GetShellUserIdForBrowserContext(
       BrowserContext* browser_context);
 
-  // Allows to register browser Mojo interfaces exposed through the
-  // RenderProcessHost.
-  virtual void ExposeInterfacesToRenderer(
-      shell::InterfaceRegistry* registry,
-      RenderProcessHost* render_process_host) {}
+  // Allows the client to expose interfaces to the renderer at the remote end
+  // of |connection|. Called on the IO thread.
+  virtual void ExposeInterfacesToRenderer(shell::Connection* connection) {}
 
   // Called when RenderFrameHostImpl connects to the Media service. Expose
   // interfaces to the service using |registry|.
   virtual void ExposeInterfacesToMediaService(
       shell::InterfaceRegistry* registry,
       RenderFrameHost* render_frame_host) {}
 
   // Allows to register browser Mojo interfaces exposed through the
-  // RenderFrameHost.
+  // RenderFrameHost. Called on the UI thread.
   virtual void RegisterRenderFrameMojoInterfaces(
       shell::InterfaceRegistry* registry,
       RenderFrameHost* render_frame_host) {}
 
   using StaticMojoApplicationMap = std::map<std::string, MojoApplicationInfo>;
 
   // Registers Mojo applications to be loaded in the browser process by the
   // browser's global Mojo shell.
   virtual void RegisterInProcessMojoApplications(
       StaticMojoApplicationMap* apps) {}
@@ skipping 105 matching lines @@
   // Allows an embedder to provide its own ExternalVideoSurfaceContainer
   // implementation.  Return nullptr to disable external surface video.
   virtual ExternalVideoSurfaceContainer*
   OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_