Load mac sandbox definitions from resources instead of the bundle.

chrome/nacl/nacl_main_platform_delegate_mac.mm

 // 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 "chrome/nacl/nacl_main_platform_delegate.h"
 
 #import <Cocoa/Cocoa.h>
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
+#include "chrome/common/chrome_sandbox_process_type_mac.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/common/sandbox_mac.h"
 #include "content/public/common/sandbox_init.h"
 
 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
     const content::MainFunctionParams& parameters)
     : parameters_(parameters), sandbox_test_module_(NULL) {
 }
 
 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() {
@@ skipping 26 matching lines @@
     FilePath test_dll_name =
       command_line.GetSwitchValuePath(switches::kTestNaClSandbox);
     if (!test_dll_name.empty()) {
       sandbox_test_module_ = base::LoadNativeLibrary(test_dll_name, NULL);
       CHECK(sandbox_test_module_);
     }
   }
 }
 
 void NaClMainPlatformDelegate::EnableSandbox() {
-  CHECK(content::InitializeSandbox()) << "Error initializing sandbox for "
-                                      << switches::kNaClLoaderProcess;
+  CHECK(content::InitializeSandbox(
+      CHROME_SANDBOX_PROCESS_TYPE_NACL_LOADER, FilePath()))

[jeremy, 2011/11/24 12:20:19]

imho this should be indented 4 from the start of "content::..."

[jochen (gone - plz use gerrit), 2011/11/24 16:23:22]

After renaming the constant, everything fitted into one line

Done

+          << "Error initializing sandbox for " << switches::kNaClLoaderProcess;
 }
 
 bool NaClMainPlatformDelegate::RunSandboxTests() {
   // TODO(jvoung): Win and mac should share this identical code.
   bool result = true;
   if (sandbox_test_module_) {
     RunNaClLoaderTests run_security_tests =
       reinterpret_cast<RunNaClLoaderTests>(
         base::GetFunctionPointerFromNativeLibrary(sandbox_test_module_,
                                                   kNaClLoaderTestCall));
     if (run_security_tests) {
       DVLOG(1) << "Running NaCl Loader security tests";
       result = (*run_security_tests)();
     } else {
       VLOG(1) << "Failed to get NaCl sandbox test function";
       result = false;
     }
     base::UnloadNativeLibrary(sandbox_test_module_);
     sandbox_test_module_ = NULL;
   }
   return result;
 }