Remove dependency from NaCl code on chrome_constants.

chrome/browser/nacl_host/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 "chrome/browser/nacl_host/nacl_broker_host_win.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "ipc/ipc_switches.h"
 #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
-#include "chrome/browser/nacl_host/nacl_process_host.h"
-#include "chrome/common/chrome_constants.h"
+#include "chrome/browser/nacl_host/nacl_browser.h"
 #include "chrome/common/chrome_process_type.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_messages.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/sandboxed_process_launcher_delegate.h"
 
@@ skipping 22 matching lines @@
 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())
     return false;
 
   // Create the path to the nacl broker/loader executable.
-  base::FilePath module_path;
-  if (!PathService::Get(base::FILE_MODULE, &module_path))
+  base::FilePath nacl_path;
+  if (!NaClBrowser::GetInstance()->GetNaCl64ExePath(&nacl_path))
     return false;
 
-  base::FilePath nacl_path = module_path.DirName().Append(chrome::kNaClAppName);
   CommandLine* cmd_line = new CommandLine(nacl_path);
   nacl::CopyNaClCommandLineArguments(cmd_line);
 
   cmd_line->AppendSwitchASCII(switches::kProcessType,
                               switches::kNaClBrokerProcess);
   cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
   if (logging::DialogsAreSuppressed())
     cmd_line->AppendSwitch(switches::kNoErrorDialogs);
 
   process_->Launch(new NaClBrokerSandboxedProcessLauncherDelegate, cmd_line);
@@ skipping 36 matching lines @@
 
 void NaClBrokerHost::OnDebugExceptionHandlerLaunched(int32 pid, bool success) {
   NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid,
                                                                     success);
 }
 
 void NaClBrokerHost::StopBroker() {
   is_terminating_ = true;
   process_->Send(new NaClProcessMsg_StopBroker());
 }