Move more files from chrome/browser/nacl_host/ to components/nacl/browser/

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 "chrome/browser/nacl_host/nacl_broker_host_win.h"
+#include "components/nacl/browser/nacl_broker_host_win.h"
 
 #include "base/base_switches.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 "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/sandboxed_process_launcher_delegate.h"
+#include "ipc/ipc_switches.h"
 
 namespace {
 // NOTE: changes to this class need to be reviewed by the security team.
 class NaClBrokerSandboxedProcessLauncherDelegate
     : public content::SandboxedProcessLauncherDelegate {
  public:
   NaClBrokerSandboxedProcessLauncherDelegate() {}
   virtual ~NaClBrokerSandboxedProcessLauncherDelegate() {}
 
   virtual void ShouldSandbox(bool* in_sandbox) OVERRIDE {
     *in_sandbox = false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NaClBrokerSandboxedProcessLauncherDelegate);
 };
 }  // namespace
 
+namespace nacl {
+
 NaClBrokerHost::NaClBrokerHost() : is_terminating_(false) {
   process_.reset(content::BrowserChildProcessHost::Create(
       PROCESS_TYPE_NACL_BROKER, this));
 }
 
 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 nacl_path;
-  if (!nacl::NaClBrowser::GetInstance()->GetNaCl64ExePath(&nacl_path))
+  if (!NaClBrowser::GetInstance()->GetNaCl64ExePath(&nacl_path))
     return false;
 
   CommandLine* cmd_line = new CommandLine(nacl_path);
-  nacl::CopyNaClCommandLineArguments(cmd_line);
+  CopyNaClCommandLineArguments(cmd_line);
 
   cmd_line->AppendSwitchASCII(switches::kProcessType,
                               switches::kNaClBrokerProcess);
   cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
-  if (nacl::NaClBrowser::GetDelegate()->DialogsAreSuppressed())
+  if (NaClBrowser::GetDelegate()->DialogsAreSuppressed())
     cmd_line->AppendSwitch(switches::kNoErrorDialogs);
 
   process_->Launch(new NaClBrokerSandboxedProcessLauncherDelegate, cmd_line);
   return true;
 }
 
 bool NaClBrokerHost::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NaClBrokerHost, msg)
     IPC_MESSAGE_HANDLER(NaClProcessMsg_LoaderLaunched, OnLoaderLaunched)
@@ skipping 29 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());
 }
+
+}  // namespace nacl