Use ChannelMojo in Pepper and NaCl processes.

content/browser/gpu/gpu_process_host.cc

Index: content/browser/gpu/gpu_process_host.cc
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index af70856cc2bc503bd7e44fdd614b40b554c9baa4..5c602099db25986ebd6b82fc0746375874998119 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -542,8 +542,9 @@ bool GpuProcessHost::Init() {
 
   TRACE_EVENT_INSTANT0("gpu", "LaunchGpuProcess", TRACE_EVENT_SCOPE_THREAD);
 
-  std::string channel_id = process_->GetHost()->CreateChannel();
-  if (channel_id.empty())
+  std::string mojo_channel_token =
+      process_->GetHost()->CreateChannelMojo(child_token_);
+  if (mojo_channel_token.empty())
     return false;
 
   DCHECK(!mojo_application_host_);
@@ -555,8 +556,8 @@ bool GpuProcessHost::Init() {
     DCHECK(g_gpu_main_thread_factory);
     in_process_gpu_thread_.reset(
         g_gpu_main_thread_factory(InProcessChildThreadParams(
-            channel_id, base::MessageLoop::current()->task_runner(),
-            std::string(), mojo_application_host_->GetToken()),
+            std::string(), base::MessageLoop::current()->task_runner(),
+            mojo_channel_token, mojo_application_host_->GetToken()),
             gpu_preferences));
     base::Thread::Options options;
 #if defined(OS_WIN)
@@ -569,7 +570,7 @@ bool GpuProcessHost::Init() {
     in_process_gpu_thread_->StartWithOptions(options);
 
     OnProcessLaunched();  // Fake a callback that the process is ready.
-  } else if (!LaunchGpuProcess(channel_id, &gpu_preferences)) {
+  } else if (!LaunchGpuProcess(mojo_channel_token, &gpu_preferences)) {
     return false;
   }
 
@@ -955,7 +956,7 @@ void GpuProcessHost::StopGpuProcess() {
   Send(new GpuMsg_Finalize());
 }
 
-bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id,
+bool GpuProcessHost::LaunchGpuProcess(const std::string& mojo_channel_token,
                                       gpu::GpuPreferences* gpu_preferences) {
   if (!(gpu_enabled_ &&
       GpuDataManagerImpl::GetInstance()->ShouldUseSwiftShader()) &&
@@ -991,7 +992,7 @@ bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id,
   base::CommandLine* cmd_line = new base::CommandLine(exe_path);
 #endif
   cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kGpuProcess);
-  cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
+  cmd_line->AppendSwitchASCII(switches::kMojoChannelToken, mojo_channel_token);
   cmd_line->AppendSwitchASCII(switches::kMojoApplicationChannelToken,
                               mojo_application_host_->GetToken());
   BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(cmd_line);