Move interface registration to OnConnect in RPH

content/public/browser/content_browser_client.h

Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 049dcf51b6ec78128cce83bf72db5b6724d6a486..b9c5e9539ca3bb84e520217a9f2b4ad25c9b89c5 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -60,11 +60,6 @@ namespace media {
 class CdmFactory;
 }
 
-namespace shell {
-class InterfaceRegistry;
-class Service;
-}
-
 namespace net {
 class CookieOptions;
 class NetLog;
@@ -80,6 +75,12 @@ namespace sandbox {
 class TargetPolicy;
 }
 
+namespace shell {
+class Connection;
+class InterfaceRegistry;
+class Service;
+}
+
 namespace ui {
 class SelectFilePolicy;
 }
@@ -646,11 +647,9 @@ class CONTENT_EXPORT ContentBrowserClient {
   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|.
@@ -659,7 +658,7 @@ class CONTENT_EXPORT ContentBrowserClient {
       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) {}