Use ChannelMojo in Pepper and NaCl processes.

components/nacl/broker/nacl_broker_listener.cc

 // Copyright 2013 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.
 
 #include "components/nacl/broker/nacl_broker_listener.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 88 matching lines @@
   // this code is running in.
   base::FilePath exe_path;
   PathService::Get(base::FILE_EXE, &exe_path);
   if (!exe_path.empty()) {
     base::CommandLine* cmd_line = new base::CommandLine(exe_path);
     nacl::CopyNaClCommandLineArguments(cmd_line);
 
     cmd_line->AppendSwitchASCII(switches::kProcessType,
                                 switches::kNaClLoaderProcess);
 
-    cmd_line->AppendSwitchASCII(switches::kProcessChannelID,
+    cmd_line->AppendSwitchASCII(switches::kMojoChannelToken,
                                 loader_channel_id);
 
     base::Process loader_process;
     sandbox::ResultCode result = content::StartSandboxedProcess(
         this, cmd_line, base::HandlesToInheritVector(), &loader_process);
 
     if (result == sandbox::SBOX_ALL_OK) {
       // Note: PROCESS_DUP_HANDLE is necessary here, because:
       // 1) The current process is the broker, which is the loader's parent.
       // 2) The browser is not the loader's parent, and so only gets the
@@ skipping 19 matching lines @@
     const std::string& startup_info) {
   NaClStartDebugExceptionHandlerThread(
       base::Process(process_handle), startup_info,
       base::ThreadTaskRunnerHandle::Get(),
       base::Bind(SendReply, channel_.get(), pid));
 }
 
 void NaClBrokerListener::OnStopBroker() {
   base::MessageLoop::current()->QuitWhenIdle();
 }