Expose the sandbox related code through the content API. I did a bit of cleanup while I was doing...

chrome/nacl/nacl_main_platform_delegate_mac.mm

Index: chrome/nacl/nacl_main_platform_delegate_mac.mm
===================================================================
--- chrome/nacl/nacl_main_platform_delegate_mac.mm	(revision 107845)
+++ chrome/nacl/nacl_main_platform_delegate_mac.mm	(working copy)
@@ -11,6 +11,7 @@
 #include "base/native_library.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/common/sandbox_mac.h"
+#include "content/public/common/sandbox_init.h"
 
 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
     const MainFunctionParams& parameters)
@@ -32,7 +33,7 @@
 }
 
 void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {
-  const CommandLine& command_line = parameters_.command_line_;
+  const CommandLine& command_line = parameters_.command_line;
 
   DVLOG(1) << "Started NaClLdr with ";
   const std::vector<std::string>& argstrings = command_line.argv();
@@ -54,13 +55,8 @@
 }
 
 void NaClMainPlatformDelegate::EnableSandbox() {
-  CommandLine* parsed_command_line = CommandLine::ForCurrentProcess();
-  SandboxInitWrapper sandbox_wrapper;
-  bool sandbox_initialized_ok =
-       sandbox_wrapper.InitializeSandbox(*parsed_command_line,
-                                         switches::kNaClLoaderProcess);
-  CHECK(sandbox_initialized_ok) << "Error initializing sandbox for "
-                                << switches::kNaClLoaderProcess;
+  CHECK(content::InitializeSandbox()) << "Error initializing sandbox for "
+                                      << switches::kNaClLoaderProcess;
 }
 
 bool NaClMainPlatformDelegate::RunSandboxTests() {