Move chrome/nacl to components/nacl.

components/nacl/broker/nacl_exe_win_64.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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/hi_res_timer_manager.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/process_util.h"
 #include "base/strings/string_util.h"
-#include "chrome/app/breakpad_win.h"
-#include "chrome/common/chrome_result_codes.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/logging_chrome.h"
-#include "chrome/nacl/nacl_broker_listener.h"
-#include "chrome/nacl/nacl_listener.h"
-#include "chrome/nacl/nacl_main_platform_delegate.h"
+#include "components/nacl/broker/nacl_broker_listener.h"
+#include "components/nacl/common/nacl_delegate.h"
+#include "components/nacl/common/nacl_switches.h"
+#include "components/nacl/loader/nacl_listener.h"
+#include "components/nacl/loader/nacl_main_platform_delegate.h"
 #include "content/public/app/startup_helper_win.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/sandbox_init.h"
 #include "sandbox/win/src/sandbox_types.h"
 
 extern int NaClMain(const content::MainFunctionParams&);
+extern void InitCrashReporter();

[jam, 2013/06/17 20:10:43]

again, you can not forward declare code from chrome in nacl.

[yael.aharon1, 2013/06/18 17:16:30]

jochen is in the process of moving this code to components/breakpad. Is it ok to
keep it like this until he is done moving the code? This is called from wWinMain
so it will be very tricky to find a way to plumb a delegate to here.

[jam, 2013/06/19 17:55:53]

you should wait for that to happen first then. it's not acceptable to declare
methods in a low level module and define them higher up.

[yael.aharon1, 2013/06/19 20:38:52]

Since I could not find an immediate solution, I moved nacl_exe_win_64.cc back to
its original location. 

 
 // main() routine for the NaCl broker process.
 // This is necessary for supporting NaCl in Chrome on Win64.
 int NaClBrokerMain(const content::MainFunctionParams& parameters) {
   const CommandLine& parsed_command_line = parameters.command_line;
 
   base::MessageLoopForIO main_message_loop;
   base::PlatformThread::SetName("CrNaClBrokerMain");
 
   base::PowerMonitor power_monitor;
   HighResolutionTimerManager hi_res_timer_manager;
 
   NaClBrokerListener listener;
   listener.Listen();
 
   return 0;
 }
 
 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   content::InitializeSandboxInfo(&sandbox_info);
 
   base::AtExitManager exit_manager;
   CommandLine::Init(0, NULL);
 
   InitCrashReporter();
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  std::string process_type =
-      command_line.GetSwitchValueASCII(switches::kProcessType);
+  std::string process_type = command_line.GetSwitchValueASCII(
+      switches::kProcessType);
 
   // Copy what ContentMain() does.
   base::EnableTerminationOnHeapCorruption();
   base::EnableTerminationOnOutOfMemory();
   content::RegisterInvalidParamHandler();
   content::SetupCRT(command_line);
   // Route stdio to parent console (if any) or create one.
   if (command_line.HasSwitch(switches::kEnableLogging))
     base::RouteStdioToConsole();
 
   // Initialize the sandbox for this process.
   bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info);
   // Die if the sandbox can't be enabled.
   CHECK(sandbox_initialized_ok) << "Error initializing sandbox for "
                                 << process_type;
   content::MainFunctionParams main_params(command_line);
   main_params.sandbox_info = &sandbox_info;
 
   if (process_type == switches::kNaClLoaderProcess)
     return NaClMain(main_params);
 
   if (process_type == switches::kNaClBrokerProcess)
     return NaClBrokerMain(main_params);
 
   CHECK(false) << "Unknown NaCl 64 process.";
   return -1;
 }