Revert of 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 683 matching lines @@
 void RenderProcessHostImpl::EnableSendQueue() {
   is_initialized_ = false;
 }
 
 bool RenderProcessHostImpl::Init() {
   // calling Init() more than once does nothing, this makes it more convenient
   // for the view host which may not be sure in some cases
   if (channel_)
     return true;
 
-  shell_pipe_token_ = RegisterChildWithExternalShell(id_, instance_id_++, this);
+  RegisterChildWithExternalShell(id_, instance_id_++, this);
 
   base::CommandLine::StringType renderer_prefix;
   // A command prefix is something prepended to the command line of the spawned
   // process.
   const base::CommandLine& browser_command_line =
       *base::CommandLine::ForCurrentProcess();
   renderer_prefix =
       browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
 
 #if defined(OS_LINUX)
@@ skipping 904 matching lines @@
   // Add kWaitForDebugger to let renderer process wait for a debugger.
   if (browser_cmd.HasSwitch(switches::kWaitForDebuggerChildren)) {
     // Look to pass-on the kWaitForDebugger flag.
     std::string value =
         browser_cmd.GetSwitchValueASCII(switches::kWaitForDebuggerChildren);
     if (value.empty() || value == switches::kRendererProcess) {
       renderer_cmd->AppendSwitch(switches::kWaitForDebugger);
     }
   }
 
-  if (!shell_pipe_token_.empty()) {
-    renderer_cmd->AppendSwitchASCII(switches::kMojoPrimordialPipeToken,
-                                    shell_pipe_token_);
-  }
-
 #if defined(OS_WIN) && !defined(OFFICIAL_BUILD)
   // Needed because we can't show the dialog from the sandbox. Don't pass
   // --no-sandbox in official builds because that would bypass the bad_flgs
   // prompt.
   if (renderer_cmd->HasSwitch(switches::kRendererStartupDialog) &&
       !renderer_cmd->HasSwitch(switches::kNoSandbox)) {
     renderer_cmd->AppendSwitch(switches::kNoSandbox);
   }
 #endif
 }
@@ skipping 931 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)));
+  }
+
+  // Send the mojo shell handle to the renderer.
+  SendExternalMojoShellHandleToChild(GetHandle(), this);
+
   // 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 200 matching lines @@
 
     // Skip widgets in other processes.
     if (rvh->GetProcess()->GetID() != GetID())
       continue;
 
     rvh->OnWebkitPreferencesChanged();
   }
 }
 
 }  // namespace content