Merge 173432

content/worker/worker_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/hi_res_timer_manager.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
@@ skipping 11 matching lines @@
 
 // Mainline routine for running as the worker process.
 int WorkerMain(const MainFunctionParams& parameters) {
   // The main message loop of the worker process.
   MessageLoop main_message_loop;
   base::PlatformThread::SetName("CrWorkerMain");
 
   base::SystemMonitor system_monitor;
   HighResolutionTimerManager hi_res_timer_manager;
 
-  ChildProcess worker_process;
-  worker_process.set_main_thread(new WorkerThread());
 #if defined(OS_WIN)
   sandbox::TargetServices* target_services =
       parameters.sandbox_info->target_services;
   if (!target_services)
     return false;
 
   // Cause advapi32 to load before the sandbox is turned on.
   unsigned int dummy_rand;
   rand_s(&dummy_rand);
   // Warm up language subsystems before the sandbox is turned on.
   ::GetUserDefaultLangID();
   ::GetUserDefaultLCID();
 
   target_services->LowerToken();
-#endif
-
-#if defined(OS_LINUX)
+#elif defined(OS_MAC)
+  // On OS X, if the sandbox fails to initialize, something has gone terribly
+  // wrong and we should die.
+  CHECK(InitializeSandbox());
+#elif defined(OS_LINUX)
+  // On Linux, the sandbox must be initialized early, before any thread is
+  // created.
   InitializeSandbox();
 #endif
+  ChildProcess worker_process;
+  worker_process.set_main_thread(new WorkerThread());
 
   const CommandLine& parsed_command_line = parameters.command_line;
   if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) {
     ChildProcess::WaitForDebugger("Worker");
   }
 
   // Load the accelerator table from the browser executable and tell the
   // message loop to use it when translating messages.
   MessageLoop::current()->Run();
 
   return 0;
 }
 
 }  // namespace content