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 "components/nacl/broker/nacl_broker_listener.h" | 14 #include "components/nacl/broker/nacl_broker_listener.h" |
15 #include "components/nacl/common/nacl_switches.h" | 15 #include "components/nacl/common/nacl_switches.h" |
16 #include "components/nacl/loader/nacl_listener.h" | 16 #include "components/nacl/loader/nacl_listener.h" |
17 #include "components/nacl/loader/nacl_main_platform_delegate.h" | 17 #include "components/nacl/loader/nacl_main_platform_delegate.h" |
18 #include "content/public/app/startup_helper_win.h" | 18 #include "content/public/app/startup_helper_win.h" |
19 #include "content/public/common/content_switches.h" | 19 #include "content/public/common/content_switches.h" |
20 #include "content/public/common/main_function_params.h" | 20 #include "content/public/common/main_function_params.h" |
21 #include "content/public/common/sandbox_init.h" | 21 #include "content/public/common/sandbox_init.h" |
22 #include "sandbox/win/src/sandbox_types.h" | 22 #include "sandbox/win/src/sandbox_types.h" |
| 23 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
| 24 #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" |
23 | 25 |
24 extern int NaClMain(const content::MainFunctionParams&); | 26 extern int NaClMain(const content::MainFunctionParams&); |
25 | 27 |
26 namespace { | 28 namespace { |
27 // main() routine for the NaCl broker process. | 29 // main() routine for the NaCl broker process. |
28 // This is necessary for supporting NaCl in Chrome on Win64. | 30 // This is necessary for supporting NaCl in Chrome on Win64. |
29 int NaClBrokerMain(const content::MainFunctionParams& parameters) { | 31 int NaClBrokerMain(const content::MainFunctionParams& parameters) { |
30 base::MessageLoopForIO main_message_loop; | 32 base::MessageLoopForIO main_message_loop; |
31 base::PlatformThread::SetName("CrNaClBrokerMain"); | 33 base::PlatformThread::SetName("CrNaClBrokerMain"); |
32 | 34 |
(...skipping 22 matching lines...) Expand all Loading... |
55 command_line.GetSwitchValueASCII(switches::kProcessType); | 57 command_line.GetSwitchValueASCII(switches::kProcessType); |
56 | 58 |
57 // Copy what ContentMain() does. | 59 // Copy what ContentMain() does. |
58 base::EnableTerminationOnHeapCorruption(); | 60 base::EnableTerminationOnHeapCorruption(); |
59 base::EnableTerminationOnOutOfMemory(); | 61 base::EnableTerminationOnOutOfMemory(); |
60 content::RegisterInvalidParamHandler(); | 62 content::RegisterInvalidParamHandler(); |
61 content::SetupCRT(command_line); | 63 content::SetupCRT(command_line); |
62 // Route stdio to parent console (if any) or create one. | 64 // Route stdio to parent console (if any) or create one. |
63 if (command_line.HasSwitch(switches::kEnableLogging)) | 65 if (command_line.HasSwitch(switches::kEnableLogging)) |
64 base::RouteStdioToConsole(); | 66 base::RouteStdioToConsole(); |
| 67 mojo::embedder::Init( |
| 68 make_scoped_ptr(new mojo::embedder::SimplePlatformSupport())); |
65 | 69 |
66 // Initialize the sandbox for this process. | 70 // Initialize the sandbox for this process. |
67 bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info); | 71 bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info); |
68 // Die if the sandbox can't be enabled. | 72 // Die if the sandbox can't be enabled. |
69 CHECK(sandbox_initialized_ok) << "Error initializing sandbox for " | 73 CHECK(sandbox_initialized_ok) << "Error initializing sandbox for " |
70 << process_type; | 74 << process_type; |
71 content::MainFunctionParams main_params(command_line); | 75 content::MainFunctionParams main_params(command_line); |
72 main_params.sandbox_info = &sandbox_info; | 76 main_params.sandbox_info = &sandbox_info; |
73 | 77 |
74 if (process_type == switches::kNaClLoaderProcess) | 78 if (process_type == switches::kNaClLoaderProcess) |
75 return NaClMain(main_params); | 79 return NaClMain(main_params); |
76 | 80 |
77 if (process_type == switches::kNaClBrokerProcess) | 81 if (process_type == switches::kNaClBrokerProcess) |
78 return NaClBrokerMain(main_params); | 82 return NaClBrokerMain(main_params); |
79 | 83 |
80 CHECK(false) << "Unknown NaCl 64 process."; | 84 CHECK(false) << "Unknown NaCl 64 process."; |
81 return -1; | 85 return -1; |
82 } | 86 } |
83 | 87 |
84 } // namespace nacl | 88 } // namespace nacl |
OLD | NEW |