Establish MojoChildConnection from BrowserChildProcessHostImpl

content/browser/browser_child_process_host_impl.h

Index: content/browser/browser_child_process_host_impl.h
diff --git a/content/browser/browser_child_process_host_impl.h b/content/browser/browser_child_process_host_impl.h
index 082fdf6e193507030dabc263b2aa3b37de2b7f59..2d0792ef4bc04809305240c2e16fe7519622a22f 100644
--- a/content/browser/browser_child_process_host_impl.h
+++ b/content/browser/browser_child_process_host_impl.h
@@ -40,6 +40,7 @@ namespace content {
 class BrowserChildProcessHostIterator;
 class BrowserChildProcessObserver;
 class BrowserMessageFilter;
+class MojoChildConnection;
 
 // Plugins/workers and other child processes that live on the IO thread use this
 // class. RenderProcessHostImpl is the main exception that doesn't use this
@@ -54,7 +55,7 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl
  public:
   BrowserChildProcessHostImpl(content::ProcessType process_type,
                               BrowserChildProcessHostDelegate* delegate,
-                              const std::string& mojo_child_token);
+                              const std::string& service_name);
   ~BrowserChildProcessHostImpl() override;
 
   // Terminates all child processes and deletes each BrowserChildProcessHost
@@ -77,12 +78,12 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl
                                                int* exit_code) override;
   void SetName(const base::string16& name) override;
   void SetHandle(base::ProcessHandle handle) override;
-  shell::InterfaceProvider* GetRemoteInterfaces() override;
 
   // ChildProcessHostDelegate implementation:
   bool CanShutdown() override;
   void OnChildDisconnected() override;
   const base::Process& GetProcess() const override;
+  shell::InterfaceProvider* GetRemoteInterfaces() override;
   bool OnMessageReceived(const IPC::Message& message) override;
   void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
@@ -105,6 +106,10 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl
 
   BrowserChildProcessHostDelegate* delegate() const { return delegate_; }
 
+  MojoChildConnection* child_connection() const {
+    return child_connection_.get();
+  }
+
   typedef std::list<BrowserChildProcessHostImpl*> BrowserChildProcessList;
  private:
   friend class BrowserChildProcessHostIterator;
@@ -136,7 +141,9 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl
   ChildProcessData data_;
   BrowserChildProcessHostDelegate* delegate_;
   std::unique_ptr<ChildProcessHost> child_process_host_;
-  const std::string mojo_child_token_;
+
+  const std::string child_token_;
+  std::unique_ptr<MojoChildConnection> child_connection_;
 
   std::unique_ptr<ChildProcessLauncher> child_process_;