Bootstrap Mojo IPC independent of Chrome IPC

content/browser/renderer_host/render_process_host_impl.cc

 // Copyright 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 610 matching lines @@
   // attachment broker, rather than an unprivileged attachment broker.
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   IPC::AttachmentBrokerPrivileged::CreateBrokerIfNeeded(
       MachBroker::GetInstance());
 #else
   IPC::AttachmentBrokerPrivileged::CreateBrokerIfNeeded();
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 #endif  // USE_ATTACHMENT_BROKER
 
 #if defined(MOJO_SHELL_CLIENT)
-  RegisterChildWithExternalShell(id_, this);
+  shell_pipe_token_ = RegisterChildWithExternalShell(id_, this);
 #endif
 }
 
 // static
 void RenderProcessHostImpl::ShutDownInProcessRenderer() {
   DCHECK(g_run_renderer_in_process_);
 
   switch (g_all_hosts.Pointer()->size()) {
     case 0:
       return;
@@ skipping 974 matching lines @@
     std::string value =
         browser_cmd.GetSwitchValueASCII(switches::kWaitForDebuggerChildren);
     if (value.empty() || value == switches::kRendererProcess) {
       renderer_cmd->AppendSwitch(switches::kWaitForDebugger);
     }
   }
 
 #if defined(MOJO_SHELL_CLIENT)
   if (IsRunningInMojoShell())
     renderer_cmd->AppendSwitch(switches::kEnableMojoShellConnection);
+  if (!shell_pipe_token_.empty()) {
+    renderer_cmd->AppendSwitchASCII(switches::kMojoPrimordialPipeToken,
+                                    shell_pipe_token_);

[jam, 2016/02/13 04:15:13]

You'll want to do the same thing in BrowserChildProcessHostImpl so that this
pipe is also setup for non-renderer processes

[Ken Rockot(use gerrit already), 2016/02/13 04:35:09]

Yeah, I'm intentionally keeping this on render processes only for this CL. My
plan is to expand this to all child processes soon.

+  }
 #endif
 }
 
 base::ProcessHandle RenderProcessHostImpl::GetHandle() const {
   if (run_renderer_in_process())
     return base::GetCurrentProcessHandle();
 
   if (!child_process_launcher_.get() || child_process_launcher_->IsStarting())
     return base::kNullProcessHandle;
 
@@ skipping 923 matching lines @@
   // ExtensionService uses this notification to initialize the renderer process
   // with state that must be there before any JavaScript executes.
   //
   // The queued messages contain such things as "navigate". If this notification
   // was after, we can end up executing JavaScript before the initialization
   // happens.
   NotificationService::current()->Notify(NOTIFICATION_RENDERER_PROCESS_CREATED,
                                          Source<RenderProcessHost>(this),
                                          NotificationService::NoDetails());
 
-  if (child_process_launcher_.get()) {
-    base::ProcessHandle process_handle =
-        child_process_launcher_->GetProcess().Handle();
-    mojo::edk::ScopedPlatformHandle client_pipe =
-        mojo::edk::ChildProcessLaunched(process_handle);
-    Send(new ChildProcessMsg_SetMojoParentPipeHandle(
-        IPC::GetFileHandleForProcess(client_pipe.release().handle,
-                                     process_handle, true)));
-  }
-
-#if defined(MOJO_SHELL_CLIENT)
-  // Send the mojo shell handle to the renderer.
-  SendExternalMojoShellHandleToChild(GetHandle(), this);
-#endif
-
   // Allow Mojo to be setup before the renderer sees any Chrome IPC messages.
   // This way, Mojo can be safely used from the renderer in response to any
   // Chrome IPC message.
   mojo_application_host_->Activate(this, GetHandle());
 
   while (!queued_messages_.empty()) {
     Send(queued_messages_.front());
     queued_messages_.pop();
   }
 
@@ skipping 196 matching lines @@
 void RenderProcessHostImpl::GetAudioOutputControllers(
     const GetAudioOutputControllersCallback& callback) const {
   audio_renderer_host()->GetOutputControllers(callback);
 }
 
 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
   return bluetooth_dispatcher_host_.get();
 }
 
 }  // namespace content