Load mac sandbox definitions from resources instead of the bundle.

content/public/common/sandbox_init.h

Index: content/public/common/sandbox_init.h
diff --git a/content/public/common/sandbox_init.h b/content/public/common/sandbox_init.h
index 3415e0d4abb8e2e9ba33986add4141e7dc1f07e9..a51da0cfdcab5e09c3837ed6eee4c30b6a96a5a0 100644
--- a/content/public/common/sandbox_init.h
+++ b/content/public/common/sandbox_init.h
@@ -13,10 +13,13 @@
 namespace sandbox {
 struct SandboxInterfaceInfo;
 }
+#elif defined(OS_MACOSX)
+class FilePath;
 #endif
 
 namespace content {
 
+#if defined(OS_WIN)
 // Initialize the sandbox for renderer, gpu, utility, worker, nacl, and plug-in
 // processes, depending on the command line flags. Although The browser process
 // is not sandboxed, this also needs to be called because it will initialize
@@ -24,11 +27,23 @@ namespace content {
 // Returns true if the sandbox was initialized succesfully, false if an error
 // occurred.  If process_type isn't one that needs sandboxing true is always
 // returned.
-#if defined(OS_WIN)
 CONTENT_EXPORT bool InitializeSandbox(
     sandbox::SandboxInterfaceInfo* sandbox_info);
 #elif defined(OS_MACOSX)
-CONTENT_EXPORT bool InitializeSandbox();
+// Initialize the sandbox of the given |sandbox_type|, optionally specifying a
+// directory to allow access to. This needs to be supported by the sandbox
+// policy associated with the given |sandbox_type|.
+//
+// The sandbox policy to use for this |sandbox_type| is queried using
+// ContentClient::GetSandboxPolicyForSandboxType(). The embedder can use values
+// for |sandbox_type| starting from
+// content::sandbox::SANDBOX_AFTER_TYPE_LAST_TYPE.

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

We need the unit tests to run on all sandbox types, how is this achieved if
embedders can add their own out-of-band sandbox types?

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

The embedder will have to test their own definitions themselves

+//
+// Returns true if the sandbox was initialized succesfully, false if an error
+// occurred.  If process_type isn't one that needs sandboxing true is always
+// returned.
+CONTENT_EXPORT bool InitializeSandbox(int sandbox_type,
+                                      const FilePath& allowed_path);
 #endif
 
 }  // namespace content