From 84638c7803f273f97679ea948609c05f6d5cbafa Mon Sep 17 00:00:00 2001 From: "dspringer@google.com" Date: Tue, 2 Mar 2010 20:13:08 +0000 Subject: Remove the --enable-nacl-on-mac flag, since the syscall thunking code is secure now. The mac no longer needs 2 flags in order to load .nexes, it is only behind the --internal-nacl flag like everyone else. BUG=328 (tracked in the Native Client project) TEST=Run Chrome on a Mac without the --enable-nacl-on-mac flag, and load a .nexe. It should work. Review URL: http://codereview.chromium.org/661370 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40411 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/nacl_host/nacl_process_host.cc | 10 +--------- chrome/browser/renderer_host/browser_render_process_host.cc | 4 ---- chrome/common/chrome_switches.cc | 6 ------ chrome/common/chrome_switches.h | 4 ---- chrome/common/nacl_cmd_line.cc | 4 ---- chrome/test/nacl/nacl_test.cc | 3 --- 6 files changed, 1 insertion(+), 30 deletions(-) diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 2b3ebd2..9a08d54 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -86,14 +86,6 @@ bool NaClProcessHost::LaunchSelLdr() { CommandLine* cmd_line = new CommandLine(exe_path); nacl::CopyNaClCommandLineArguments(cmd_line); -#if defined(OS_MACOSX) - // TODO(dspringer): NaCl is temporalrily disabled on the Mac by default, but - // it can be enabled with the --enable-nacl cmd-line switch. Remove this check - // when the security issues in the Mac PIC code are resolved. - if (!cmd_line->HasSwitch(switches::kEnableNaClOnMac)) - return false; -#endif - cmd_line->AppendSwitchWithValue(switches::kProcessType, switches::kNaClLoaderProcess); @@ -106,7 +98,7 @@ bool NaClProcessHost::LaunchSelLdr() { NaClBrokerService::GetInstance()->Init(resource_dispatcher_host_); NaClBrokerService::GetInstance()->LaunchLoader(this, ASCIIToWide(channel_id())); - } else + } else // NO_LINT #endif ChildProcessHost::Launch( #if defined(OS_WIN) diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 6d69671..5230bab 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -498,10 +498,6 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( // These are unsupported and not fully tested modes, so don't enable them // for official Google Chrome builds. switches::kInProcessPlugins, -#if defined(OS_MACOSX) - // TODO(dspringer): remove this when NaCl x86-32 security issues are fixed - switches::kEnableNaClOnMac, -#endif // OS_MACOSX #endif // GOOGLE_CHROME_BUILD switches::kDomAutomationController, switches::kUserAgent, diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 77fcf4d..0093fe6 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -263,12 +263,6 @@ const char kEnableLogging[] = "enable-logging"; // assumed to be sRGB. const char kEnableMonitorProfile[] = "enable-monitor-profile"; -// Enables launching of Native Client processes. -// TODO(dspringer): NaCl is disabled on the Mac by default until the -// NaClSyscallSeg relocatable code can be made secure. Use this switch to -// enable NaCl loading on the Mac for development. -const char kEnableNaClOnMac[] = "enable-nacl-on-mac"; - // Enable Native Web Worker support. const char kEnableNativeWebWorkers[] = "enable-native-web-workers"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 0349dc6..59fc3e6 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -91,10 +91,6 @@ extern const char kEnableIPv6[]; extern const char kEnableLogging[]; extern const char kEnableMonitorProfile[]; extern const char kEnableNativeWebWorkers[]; -#if defined(OS_MACOSX) -// TODO(dspringer): remove this when NaCl x86-32 security issues are fixed -extern const char kEnableNaClOnMac[]; -#endif extern const char kEnablePrivacyBlacklists[]; extern const char kEnableRendererAccessibility[]; extern const char kEnableSeccompSandbox[]; diff --git a/chrome/common/nacl_cmd_line.cc b/chrome/common/nacl_cmd_line.cc index 2212c68..2893860 100644 --- a/chrome/common/nacl_cmd_line.cc +++ b/chrome/common/nacl_cmd_line.cc @@ -27,10 +27,6 @@ namespace nacl { switches::kEnableDCHECK, switches::kSilentDumpOnDCHECK, switches::kMemoryProfiling, -#if defined(OS_MACOSX) - // TODO(dspringer): remove this when NaCl x86-32 security issues are fixed - switches::kEnableNaClOnMac, -#endif }; for (size_t i = 0; i < arraysize(switch_names); ++i) { diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc index 50b2b75..d2f29d7 100644 --- a/chrome/test/nacl/nacl_test.cc +++ b/chrome/test/nacl/nacl_test.cc @@ -55,9 +55,6 @@ NaClTest::NaClTest() #if defined(OS_MACOSX) || defined(OS_LINUX) launch_arguments_.AppendSwitch(switches::kNoSandbox); #endif -#if defined(OS_MACOSX) - launch_arguments_.AppendSwitch(switches::kEnableNaClOnMac); -#endif } NaClTest::~NaClTest() {} -- cgit v1.1