Index: components/nacl/nacl/nacl_exe_win_64.cc |
diff --git a/chrome/nacl/nacl_exe_win_64.cc b/components/nacl/nacl/nacl_exe_win_64.cc |
similarity index 78% |
rename from chrome/nacl/nacl_exe_win_64.cc |
rename to components/nacl/nacl/nacl_exe_win_64.cc |
index 7ba3c404b6cdb9d605a63aac7e6ba1eb494a23e6..350e5695f28de5344e52fb29e838a89ab6674721 100644 |
--- a/chrome/nacl/nacl_exe_win_64.cc |
+++ b/components/nacl/nacl/nacl_exe_win_64.cc |
@@ -10,19 +10,17 @@ |
#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/common/nacl_delegate.h" |
+#include "components/nacl/nacl/nacl_broker_listener.h" |
+#include "components/nacl/nacl/nacl_listener.h" |
+#include "components/nacl/nacl/nacl_main_platform_delegate.h" |
#include "content/public/app/startup_helper_win.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(); |
// main() routine for the NaCl broker process. |
// This is necessary for supporting NaCl in Chrome on Win64. |
@@ -51,8 +49,8 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
InitCrashReporter(); |
const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
- std::string process_type = |
- command_line.GetSwitchValueASCII(switches::kProcessType); |
+ std::string process_type = command_line.GetSwitchValueASCII( |
+ GetNaClDelegate()->GetSwitch(NaClDelegate::kProcessType)); |
// Copy what ContentMain() does. |
base::EnableTerminationOnHeapCorruption(); |
@@ -60,7 +58,8 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
content::RegisterInvalidParamHandler(); |
content::SetupCRT(command_line); |
// Route stdio to parent console (if any) or create one. |
- if (command_line.HasSwitch(switches::kEnableLogging)) |
+ if (command_line.HasSwitch(GetNaClDelegate()->GetSwitch( |
+ NaClDelegate::kEnableLogging))) |
base::RouteStdioToConsole(); |
// Initialize the sandbox for this process. |
@@ -71,10 +70,12 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
content::MainFunctionParams main_params(command_line); |
main_params.sandbox_info = &sandbox_info; |
- if (process_type == switches::kNaClLoaderProcess) |
+ if (process_type == GetNaClDelegate()->GetSwitch( |
+ NaClDelegate::kNaClLoaderProcess)) |
return NaClMain(main_params); |
- if (process_type == switches::kNaClBrokerProcess) |
+ if (process_type == GetNaClDelegate()->GetSwitch( |
+ NaClDelegate::kNaClBrokerProcess)) |
return NaClBrokerMain(main_params); |
CHECK(false) << "Unknown NaCl 64 process."; |