Make NaCl run in Chrome on the Mac.

NOTE: This uses some assembly that is NOT SECURE. This CL is for development
ONLY.

BUG=none
TEST=none

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

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

5 files changed, 64 insertions, 18 deletions

diff --git a/chrome/browser/nacl_process_host.cc b/chrome/browser/nacl_process_host.cc
index da40335..53af990 100644
--- a/chrome/browser/nacl_process_host.cc
+++ b/chrome/browser/nacl_process_host.cc
@@ -94,13 +94,22 @@ bool NaClProcessHost::LaunchSelLdr() {
     switches::kEnableDCHECK,
     switches::kSilentDumpOnDCHECK,
     switches::kMemoryProfiling,
+    switches::kEnableNaCl,
   };
 
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
+
+#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 (!browser_command_line.HasSwitch(switches::kEnableNaCl))
+    return false;
+#endif
+
   for (size_t i = 0; i < arraysize(switch_names); ++i) {
     if (browser_command_line.HasSwitch(switch_names[i])) {
-      cmd_line->AppendSwitchWithValue(
-          switch_names[i],
+      cmd_line->AppendSwitchWithValue(switch_names[i],
           browser_command_line.GetSwitchValueASCII(switch_names[i]));
     }
   }
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 6a79b40..5ff39e9 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -495,9 +495,10 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer(
     switches::kTestSandbox,
     switches::kEnableSeccompSandbox,
 #if !defined (GOOGLE_CHROME_BUILD)
-    // This is an unsupported and not fully tested mode, so don't enable it for
-    // official Chrome builds.
+    // These are unsupported and not fully tested modes, so don't enable them
+    // for official Google Chrome builds.
     switches::kInProcessPlugins,
+    switches::kEnableNaCl,
 #endif
     switches::kDomAutomationController,
     switches::kUserAgent,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index b2fbbaf..fb31f69 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -222,6 +222,12 @@ 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 kEnableNaCl[]                    = "enable-nacl";
+
 // Enable Native Web Worker support.
 const char kEnableNativeWebWorkers[]        = "enable-native-web-workers";
 
@@ -377,6 +383,9 @@ const char kMetricsRecordingOnly[]          = "metrics-recording-only";
 // Causes the process to run as a NativeClient's sel_ldr subprocess.
 const char kNaClProcess[]                   = "nacl";
 
+// Causes the Native Client process to display a dialog on launch.
+const char kNaClStartupDialog[]             = "nacl-startup-dialog";
+
 // Allows the new tab page resource to be loaded from a local HTML file. This
 // should be a path to the HTML file that you want to use for the new tab page.
 // It is used for manually testing new versions of the new tab page only,
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 7a4ac89..53f4587 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -80,6 +80,7 @@ extern const char kDisableLocalStorage[];
 extern const char kEnableLogging[];
 extern const char kEnableMonitorProfile[];
 extern const char kEnableNativeWebWorkers[];
+extern const char kEnableNaCl[];
 extern const char kEnableNewAutoFill[];
 extern const char kEnablePrivacyBlacklists[];
 extern const char kEnableRendererAccessibility[];
@@ -117,6 +118,7 @@ extern const char kMemoryProfiling[];
 extern const char kMessageLoopHistogrammer[];
 extern const char kMetricsRecordingOnly[];
 extern const char kNaClProcess[];
+extern const char kNaClStartupDialog[];
 extern const char kNewTabPage[];
 extern const char kNoDefaultBrowserCheck[];
 extern const char kNoEvents[];
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index 5271cf4..255b2ce 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -22,8 +22,42 @@
 #include "chrome/common/main_function_params.h"
 #include "chrome/nacl/nacl_thread.h"
 
+// This function provides some ways to test crash and assertion handling
+// behavior of the renderer.
+static void HandleNaClTestParameters(const CommandLine& command_line) {
+  if (command_line.HasSwitch(switches::kNaClStartupDialog)) {
+    ChildProcess::WaitForDebugger(L"NativeClient");
+  }
+}
+
+// Launch the NaCl child process in its own thread.
+#if defined (OS_WIN)
+static void LaunchNaClChildProcess(bool no_sandbox,
+                                   sandbox::TargetServices* target_services) {
+  ChildProcess nacl_process;
+  nacl_process.set_main_thread(new NaClThread());
+  if (!no_sandbox && target_services)
+    target_services->LowerToken();
+  MessageLoop::current()->Run();
+}
+#else
+static void LaunchNaClChildProcess() {
+  ChildProcess nacl_process;
+  nacl_process.set_main_thread(new NaClThread());
+  MessageLoop::current()->Run();
+}
+#endif
+
 // main() routine for running as the sel_ldr process.
 int NaClMain(const MainFunctionParams& parameters) {
+  const CommandLine& parsed_command_line = parameters.command_line_;
+
+  // This function allows pausing execution using the --nacl-startup-dialog
+  // flag allowing us to attach a debugger.
+  // Do not move this function down since that would mean we can't easily debug
+  // whatever occurs before it.
+  HandleNaClTestParameters(parsed_command_line);
+
   // The main thread of the plugin services IO.
   MessageLoopForIO main_message_loop;
   std::wstring app_name = chrome::kBrowserAppName;
@@ -33,8 +67,6 @@ int NaClMain(const MainFunctionParams& parameters) {
   HighResolutionTimerManager hi_res_timer_manager;
 
 #if defined(OS_WIN)
-  const CommandLine& parsed_command_line = parameters.command_line_;
-
   sandbox::TargetServices* target_services =
       parameters.sandbox_info_.TargetServices();
 
@@ -52,22 +84,15 @@ int NaClMain(const MainFunctionParams& parameters) {
       DCHECK(sandbox_test_module);
     }
   }
+  LaunchNaClChildProcess(no_sandbox, target_services);
 
-#else
-  NOTIMPLEMENTED() << " non-windows startup, plugin startup dialog etc.";
-#endif
+#elif defined(OS_MACOSX)
+  LaunchNaClChildProcess();
 
-  {
-    ChildProcess nacl_process;
-    nacl_process.set_main_thread(new NaClThread());
-#if defined(OS_WIN)
-    if (!no_sandbox && target_services)
-      target_services->LowerToken();
+#else
+  NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
 #endif
 
-    MessageLoop::current()->Run();
-  }
-
   return 0;
 }