Revert r207951 - "Separate NaCl switches to their own file."

chrome/nacl/nacl_broker_listener.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/nacl/nacl_broker_listener.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_debug_exception_handler_win.h"
 #include "chrome/common/nacl_messages.h"
-#include "components/nacl/common/nacl_switches.h"
-#include "content/public/common/content_switches.h"
 #include "content/public/common/sandbox_init.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_switches.h"
 #include "sandbox/win/src/sandbox_policy.h"
 
 namespace {
 
 void SendReply(IPC::Channel* channel, int32 pid, bool result) {
   channel->Send(new NaClProcessMsg_DebugExceptionHandlerLaunched(pid, result));
 }
@@ skipping 92 matching lines @@
     const std::string& startup_info) {
   NaClStartDebugExceptionHandlerThread(
       process_handle, startup_info,
       base::MessageLoopProxy::current(),
       base::Bind(SendReply, channel_.get(), pid));
 }
 
 void NaClBrokerListener::OnStopBroker() {
   base::MessageLoop::current()->Quit();
 }