| Index: content/common/sandbox_mac.h
|
| diff --git a/content/common/sandbox_mac.h b/content/common/sandbox_mac.h
|
| index 358c098a996e86d171bfd38d8fe5dccfd40e1e5b..45e89c3bbae51e912b6b2319ff08ca54b7a8fbd3 100644
|
| --- a/content/common/sandbox_mac.h
|
| +++ b/content/common/sandbox_mac.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/hash_tables.h"
|
| #include "base/gtest_prod_util.h"
|
| +#include "content/public/common/sandbox_process_type_mac.h"
|
|
|
| class FilePath;
|
|
|
| @@ -57,36 +58,9 @@ class Sandbox {
|
| typedef base::hash_map<std::string, SandboxSubstring>
|
| SandboxVariableSubstitions;
|
|
|
| - enum SandboxProcessType {
|
| - SANDBOX_TYPE_FIRST_TYPE, // Placeholder to ease iteration.
|
| -
|
| - SANDBOX_TYPE_RENDERER = SANDBOX_TYPE_FIRST_TYPE,
|
| -
|
| - // The worker process uses the most restrictive sandbox which has almost
|
| - // *everything* locked down. Only a couple of /System/Library/ paths and
|
| - // some other very basic operations (e.g., reading metadata to allow
|
| - // following symlinks) are permitted.
|
| - SANDBOX_TYPE_WORKER,
|
| -
|
| - // Utility process is as restrictive as the worker process except full
|
| - // access is allowed to one configurable directory.
|
| - SANDBOX_TYPE_UTILITY,
|
| -
|
| - // Native Client sandbox for the user's untrusted code.
|
| - SANDBOX_TYPE_NACL_LOADER,
|
| -
|
| - // GPU process.
|
| - SANDBOX_TYPE_GPU,
|
| -
|
| - // The PPAPI plugin process.
|
| - SANDBOX_TYPE_PPAPI,
|
| -
|
| - SANDBOX_AFTER_TYPE_LAST_TYPE, // Placeholder to ease iteration.
|
| - };
|
| -
|
| // Warm up System APIs that empirically need to be accessed before the Sandbox
|
| // is turned on. |sandbox_type| is the type of sandbox to warm up.
|
| - static void SandboxWarmup(SandboxProcessType sandbox_type);
|
| + static void SandboxWarmup(int sandbox_type);
|
|
|
| // Turns on the OS X sandbox for this process.
|
| // |sandbox_type| - type of Sandbox to use.
|
| @@ -94,7 +68,7 @@ class Sandbox {
|
| // profile that supports this is SANDBOX_TYPE_UTILITY .
|
| //
|
| // Returns true on success, false if an error occurred enabling the sandbox.
|
| - static bool EnableSandbox(SandboxProcessType sandbox_type,
|
| + static bool EnableSandbox(int sandbox_type,
|
| const FilePath& allowed_dir);
|
|
|
|
|
|
|