Load mac sandbox definitions from resources instead of the bundle.

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 618b8942dd45635e78c82326dbf0459e0d542bd4..dce757d14d7b85be4bf4211e0f70720f1c97f37e 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -282,8 +282,11 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
       process_type == switches::kZygoteProcess ||
 #endif
 #if defined(OS_MACOSX)
-      // Mac needs them to for scrollbar related images.
+      // Mac needs them to for scrollbar related images and for the sandbox.

[jeremy, 2011/11/23 07:02:17]

nit: *too
and for the sandbox -> and for sandbox profiles.

[jochen (gone - plz use gerrit), 2011/11/23 10:57:28]

Done.

       process_type == switches::kWorkerProcess ||
+      process_type == switches::kNaClLoaderProcess ||
+      process_type == switches::kPpapiPluginProcess ||
+      process_type == switches::kPpapiBrokerProcess ||
 #endif
       process_type == switches::kRendererProcess ||
       process_type == switches::kUtilityProcess;
@@ -607,7 +610,10 @@ void ChromeMainDelegate::PreSandboxStartup() {
     // sources.  The language should have been passed in to us from the
     // browser process as a command line flag.
     DCHECK(command_line.HasSwitch(switches::kLang) ||
-           process_type == switches::kZygoteProcess);
+           process_type == switches::kZygoteProcess ||
+           process_type == switches::kNaClLoaderProcess ||
+           process_type == switches::kPpapiBrokerProcess ||
+           process_type == switches::kPpapiPluginProcess);
 
     // TODO(markusheintz): The command line flag --lang is actually processed
     // by the CommandLinePrefStore, and made available through the PrefService