Change the NaCl loader and broker processes to use the ServiceManager.

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_constants.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 "mojo/edk/embedder/embedder.h"
@@ skipping 17 matching lines @@
 
 namespace nacl {
 
 NaClBrokerHost::NaClBrokerHost() : is_terminating_(false) {
 }
 
 NaClBrokerHost::~NaClBrokerHost() {
 }
 
 bool NaClBrokerHost::Init() {
-  const std::string mojo_child_token = mojo::edk::GenerateRandomToken();
   DCHECK(!process_);
   process_.reset(content::BrowserChildProcessHost::Create(
       static_cast<content::ProcessType>(PROCESS_TYPE_NACL_BROKER), this,
-      mojo_child_token));
+      kNaClBrokerServiceName));
 
-  // Create the channel that will be used for communicating with the broker.
-  const std::string mojo_channel_token =
-      process_->GetHost()->CreateChannelMojo(mojo_child_token);
-  if (mojo_channel_token.empty())
-    return false;
+  process_->GetHost()->CreateChannelMojo();
 
   // 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::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;
@@ skipping 36 matching lines @@
   NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid,
                                                                     success);
 }
 
 void NaClBrokerHost::StopBroker() {
   is_terminating_ = true;
   process_->Send(new NaClProcessMsg_StopBroker());
 }
 
 }  // namespace nacl