| Index: components/nacl/nacl/nacl_main.cc
|
| diff --git a/chrome/nacl/nacl_main.cc b/components/nacl/nacl/nacl_main.cc
|
| similarity index 84%
|
| rename from chrome/nacl/nacl_main.cc
|
| rename to components/nacl/nacl/nacl_main.cc
|
| index fa4835eff048c91ebed8c49c62eefdc560a9edf7..8abf9ba4e3a9b2aee346b9dadab0a0ff62e6a131 100644
|
| --- a/chrome/nacl/nacl_main.cc
|
| +++ b/components/nacl/nacl/nacl_main.cc
|
| @@ -8,11 +8,9 @@
|
| #include "base/hi_res_timer_manager.h"
|
| #include "base/message_loop.h"
|
| #include "base/power_monitor/power_monitor.h"
|
| -#include "chrome/common/chrome_result_codes.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| -#include "chrome/common/logging_chrome.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_listener.h"
|
| +#include "components/nacl/nacl/nacl_main_platform_delegate.h"
|
| #include "content/public/common/main_function_params.h"
|
|
|
| // main() routine for the NaCl loader process.
|
| @@ -30,7 +28,8 @@ int NaClMain(const content::MainFunctionParams& parameters) {
|
| NaClMainPlatformDelegate platform(parameters);
|
|
|
| platform.PlatformInitialize();
|
| - bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
|
| + bool no_sandbox = parsed_command_line.HasSwitch(GetNaClDelegate()->GetSwitch(
|
| + NaClDelegate::kNoSandbox));
|
| platform.InitSandboxTests(no_sandbox);
|
|
|
| if (!no_sandbox) {
|
|
|