OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/logging.h" | 6 #include "base/logging.h" |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/power_monitor/power_monitor.h" | 8 #include "base/power_monitor/power_monitor.h" |
9 #include "base/power_monitor/power_monitor_device_source.h" | 9 #include "base/power_monitor/power_monitor_device_source.h" |
10 #include "base/process/launch.h" | 10 #include "base/process/launch.h" |
11 #include "base/process/memory.h" | 11 #include "base/process/memory.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/timer/hi_res_timer_manager.h" | 13 #include "base/timer/hi_res_timer_manager.h" |
| 14 #include "base/win/process_startup_helper.h" |
14 #include "components/nacl/broker/nacl_broker_listener.h" | 15 #include "components/nacl/broker/nacl_broker_listener.h" |
15 #include "components/nacl/common/nacl_switches.h" | 16 #include "components/nacl/common/nacl_switches.h" |
16 #include "components/nacl/loader/nacl_listener.h" | 17 #include "components/nacl/loader/nacl_listener.h" |
17 #include "components/nacl/loader/nacl_main_platform_delegate.h" | 18 #include "components/nacl/loader/nacl_main_platform_delegate.h" |
18 #include "content/public/app/startup_helper_win.h" | 19 #include "content/public/app/sandbox_helper_win.h" |
19 #include "content/public/common/content_switches.h" | 20 #include "content/public/common/content_switches.h" |
20 #include "content/public/common/main_function_params.h" | 21 #include "content/public/common/main_function_params.h" |
21 #include "content/public/common/sandbox_init.h" | 22 #include "content/public/common/sandbox_init.h" |
22 #include "sandbox/win/src/sandbox_types.h" | 23 #include "sandbox/win/src/sandbox_types.h" |
23 | 24 |
24 extern int NaClMain(const content::MainFunctionParams&); | 25 extern int NaClMain(const content::MainFunctionParams&); |
25 | 26 |
26 namespace { | 27 namespace { |
27 // main() routine for the NaCl broker process. | 28 // main() routine for the NaCl broker process. |
28 // This is necessary for supporting NaCl in Chrome on Win64. | 29 // This is necessary for supporting NaCl in Chrome on Win64. |
(...skipping 21 matching lines...) Expand all Loading... |
50 content::InitializeSandboxInfo(&sandbox_info); | 51 content::InitializeSandboxInfo(&sandbox_info); |
51 | 52 |
52 const base::CommandLine& command_line = | 53 const base::CommandLine& command_line = |
53 *base::CommandLine::ForCurrentProcess(); | 54 *base::CommandLine::ForCurrentProcess(); |
54 std::string process_type = | 55 std::string process_type = |
55 command_line.GetSwitchValueASCII(switches::kProcessType); | 56 command_line.GetSwitchValueASCII(switches::kProcessType); |
56 | 57 |
57 // Copy what ContentMain() does. | 58 // Copy what ContentMain() does. |
58 base::EnableTerminationOnHeapCorruption(); | 59 base::EnableTerminationOnHeapCorruption(); |
59 base::EnableTerminationOnOutOfMemory(); | 60 base::EnableTerminationOnOutOfMemory(); |
60 content::RegisterInvalidParamHandler(); | 61 base::win::RegisterInvalidParamHandler(); |
61 content::SetupCRT(command_line); | 62 base::win::SetupCRT(command_line); |
62 // Route stdio to parent console (if any) or create one. | 63 // Route stdio to parent console (if any) or create one. |
63 if (command_line.HasSwitch(switches::kEnableLogging)) | 64 if (command_line.HasSwitch(switches::kEnableLogging)) |
64 base::RouteStdioToConsole(true); | 65 base::RouteStdioToConsole(true); |
65 | 66 |
66 // Initialize the sandbox for this process. | 67 // Initialize the sandbox for this process. |
67 bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info); | 68 bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info); |
68 // Die if the sandbox can't be enabled. | 69 // Die if the sandbox can't be enabled. |
69 CHECK(sandbox_initialized_ok) << "Error initializing sandbox for " | 70 CHECK(sandbox_initialized_ok) << "Error initializing sandbox for " |
70 << process_type; | 71 << process_type; |
71 content::MainFunctionParams main_params(command_line); | 72 content::MainFunctionParams main_params(command_line); |
72 main_params.sandbox_info = &sandbox_info; | 73 main_params.sandbox_info = &sandbox_info; |
73 | 74 |
74 if (process_type == switches::kNaClLoaderProcess) | 75 if (process_type == switches::kNaClLoaderProcess) |
75 return NaClMain(main_params); | 76 return NaClMain(main_params); |
76 | 77 |
77 if (process_type == switches::kNaClBrokerProcess) | 78 if (process_type == switches::kNaClBrokerProcess) |
78 return NaClBrokerMain(main_params); | 79 return NaClBrokerMain(main_params); |
79 | 80 |
80 CHECK(false) << "Unknown NaCl 64 process."; | 81 CHECK(false) << "Unknown NaCl 64 process."; |
81 return -1; | 82 return -1; |
82 } | 83 } |
83 | 84 |
84 } // namespace nacl | 85 } // namespace nacl |
OLD | NEW |