Use ChannelMojo from the browser to NaCl loader process.

components/nacl/browser/nacl_broker_host_win.cc

 // Copyright (c) 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.
 
 #include "components/nacl/browser/nacl_broker_host_win.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "components/nacl/browser/nacl_broker_service_win.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/common/nacl_cmd_line.h"
 #include "components/nacl/common/nacl_messages.h"
 #include "components/nacl/common/nacl_process_type.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/mojo_channel_switches.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "ipc/ipc_switches.h"
+#include "mojo/edk/embedder/embedder.h"
 
 namespace {
 // NOTE: changes to this class need to be reviewed by the security team.
 class NaClBrokerSandboxedProcessLauncherDelegate
     : public content::SandboxedProcessLauncherDelegate {
  public:
   NaClBrokerSandboxedProcessLauncherDelegate() {}
   ~NaClBrokerSandboxedProcessLauncherDelegate() override {}
 
   bool ShouldSandbox() override {
     return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NaClBrokerSandboxedProcessLauncherDelegate);
 };
 }  // namespace
 
 namespace nacl {
 
-NaClBrokerHost::NaClBrokerHost() : is_terminating_(false) {
+NaClBrokerHost::NaClBrokerHost()
+    : is_terminating_(false),
+      mojo_child_token_(mojo::edk::GenerateRandomToken()) {
   process_.reset(content::BrowserChildProcessHost::Create(

[Mark Seaborn, 2016/07/08 20:26:19]

It looks like this Create() call could be moved into Init().  Then you don't
need to make mojo_child_token_ a field of NaClBrokerHost.

[Anand Mistry (off Chromium), 2016/07/12 07:26:23]

Done.

-      static_cast<content::ProcessType>(PROCESS_TYPE_NACL_BROKER), this));
+      static_cast<content::ProcessType>(PROCESS_TYPE_NACL_BROKER), this,
+      mojo_child_token_));
 }
 
 NaClBrokerHost::~NaClBrokerHost() {
 }
 
 bool NaClBrokerHost::Init() {
   // Create the channel that will be used for communicating with the broker.
-  std::string channel_id = process_->GetHost()->CreateChannel();
-  if (channel_id.empty())
+  std::string mojo_channel_token =
+      process_->GetHost()->CreateChannelMojo(mojo_child_token_);
+  if (mojo_channel_token.empty())
     return false;
 
   // Create the path to the nacl broker/loader executable.
   base::FilePath nacl_path;
   if (!NaClBrowser::GetInstance()->GetNaCl64ExePath(&nacl_path))
     return false;
 
   base::CommandLine* cmd_line = new base::CommandLine(nacl_path);
   CopyNaClCommandLineArguments(cmd_line);
 
   cmd_line->AppendSwitchASCII(switches::kProcessType,
                               switches::kNaClBrokerProcess);
-  cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
+  cmd_line->AppendSwitchASCII(switches::kMojoChannelToken, mojo_channel_token);
   if (NaClBrowser::GetDelegate()->DialogsAreSuppressed())
     cmd_line->AppendSwitch(switches::kNoErrorDialogs);
 
   process_->Launch(new NaClBrokerSandboxedProcessLauncherDelegate,
                    cmd_line,
                    true);
   return true;
 }
 
 bool NaClBrokerHost::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NaClBrokerHost, msg)
     IPC_MESSAGE_HANDLER(NaClProcessMsg_LoaderLaunched, OnLoaderLaunched)
     IPC_MESSAGE_HANDLER(NaClProcessMsg_DebugExceptionHandlerLaunched,
                         OnDebugExceptionHandlerLaunched)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 bool NaClBrokerHost::LaunchLoader(const std::string& loader_channel_id) {

[Mark Seaborn, 2016/07/08 20:26:19]

"token" rather than "id" now?

[Anand Mistry (off Chromium), 2016/07/12 07:26:23]

Done.

   return process_->Send(
       new NaClProcessMsg_LaunchLoaderThroughBroker(loader_channel_id));
 }
 
 void NaClBrokerHost::OnLoaderLaunched(const std::string& loader_channel_id,
                                       base::ProcessHandle handle) {
   NaClBrokerService::GetInstance()->OnLoaderLaunched(loader_channel_id, handle);
 }
 
 bool NaClBrokerHost::LaunchDebugExceptionHandler(
@@ skipping 15 matching lines @@
   NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid,
                                                                     success);
 }
 
 void NaClBrokerHost::StopBroker() {
   is_terminating_ = true;
   process_->Send(new NaClProcessMsg_StopBroker());
 }
 
 }  // namespace nacl