Rename NaCl flag for Mac to avoid confusion with --internal-nacl

Review URL: http://codereview.chromium.org/549197

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37546 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 15 insertions, 6 deletions

diff --git a/chrome/browser/nacl_process_host.cc b/chrome/browser/nacl_process_host.cc
index 53af990..f736ab7 100644
--- a/chrome/browser/nacl_process_host.cc
+++ b/chrome/browser/nacl_process_host.cc
@@ -94,7 +94,10 @@ bool NaClProcessHost::LaunchSelLdr() {
     switches::kEnableDCHECK,
     switches::kSilentDumpOnDCHECK,
     switches::kMemoryProfiling,
-    switches::kEnableNaCl,
+#if defined(OS_MACOSX)
+    // TODO(dspringer): remove this when NaCl x86-32 security issues are fixed
+    switches::kEnableNaClOnMac,
+#endif
   };
 
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
@@ -103,7 +106,7 @@ bool NaClProcessHost::LaunchSelLdr() {
 // 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 (!browser_command_line.HasSwitch(switches::kEnableNaCl))
+  if (!browser_command_line.HasSwitch(switches::kEnableNaClOnMac))
     return false;
 #endif
 
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 5ff39e9..2316f9c 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -498,8 +498,11 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
     // These are unsupported and not fully tested modes, so don't enable them
     // for official Google Chrome builds.
     switches::kInProcessPlugins,
-    switches::kEnableNaCl,
-#endif
+#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,
     switches::kJavaScriptFlags,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 7b99cdf..574752a 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -230,7 +230,7 @@ const char kEnableMonitorProfile[]          = "enable-monitor-profile";
 // 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 kEnableNaCl[]                    = "enable-nacl";
+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 e29b7f8..4f8d4d6 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -81,7 +81,10 @@ extern const char kDisableLocalStorage[];
 extern const char kEnableLogging[];
 extern const char kEnableMonitorProfile[];
 extern const char kEnableNativeWebWorkers[];
-extern const char kEnableNaCl[];
+#if defined(OS_MACOSX)
+// TODO(dspringer): remove this when NaCl x86-32 security issues are fixed
+extern const char kEnableNaClOnMac[];
+#endif
 extern const char kEnableNewAutoFill[];
 extern const char kEnablePrivacyBlacklists[];
 extern const char kEnableRendererAccessibility[];