| Index: content/common/sandbox_mac.h
|
| diff --git a/content/common/sandbox_mac.h b/content/common/sandbox_mac.h
|
| index d28fdf7796d2aa95b43d36330af9ff13094a762d..ea23ce521b490cc1a0a246c4f52e7d7cccdbc75c 100644
|
| --- a/content/common/sandbox_mac.h
|
| +++ b/content/common/sandbox_mac.h
|
| @@ -13,7 +13,9 @@
|
| #include "content/common/content_export.h"
|
| #include "content/public/common/sandbox_type_mac.h"
|
|
|
| +namespace base {
|
| class FilePath;
|
| +}
|
|
|
| #if __OBJC__
|
| @class NSArray;
|
| @@ -73,7 +75,7 @@ class CONTENT_EXPORT Sandbox {
|
| //
|
| // Returns true on success, false if an error occurred enabling the sandbox.
|
| static bool EnableSandbox(int sandbox_type,
|
| - const FilePath& allowed_dir);
|
| + const base::FilePath& allowed_dir);
|
|
|
|
|
| // Exposed for testing purposes, used by an accessory function of our tests
|
| @@ -89,7 +91,7 @@ class CONTENT_EXPORT Sandbox {
|
| // The returned string contains embedded variables. The function fills in
|
| // |substitutions| to contain the values for these variables.
|
| static NSString* BuildAllowDirectoryAccessSandboxString(
|
| - const FilePath& allowed_dir,
|
| + const base::FilePath& allowed_dir,
|
| SandboxVariableSubstitions* substitutions);
|
|
|
| // Assemble the final sandbox profile from a template by removing comments
|
| @@ -126,7 +128,7 @@ class CONTENT_EXPORT Sandbox {
|
| private:
|
| // Returns an (allow file-read-metadata) rule for |allowed_path| and all its
|
| // parent directories.
|
| - static NSString* AllowMetadataForPath(const FilePath& allowed_path);
|
| + static NSString* AllowMetadataForPath(const base::FilePath& allowed_path);
|
|
|
| // Escape |src_utf8| for use in a plain string variable in a sandbox
|
| // configuraton file. On return |dst| is set to the quoted output.
|
| @@ -151,7 +153,7 @@ class CONTENT_EXPORT Sandbox {
|
| // Convert provided path into a "canonical" path matching what the Sandbox
|
| // expects i.e. one without symlinks.
|
| // This path is not necessarily unique e.g. in the face of hardlinks.
|
| - static FilePath GetCanonicalSandboxPath(const FilePath& path);
|
| + static base::FilePath GetCanonicalSandboxPath(const base::FilePath& path);
|
|
|
| FRIEND_TEST_ALL_PREFIXES(MacDirAccessSandboxTest, StringEscape);
|
| FRIEND_TEST_ALL_PREFIXES(MacDirAccessSandboxTest, RegexEscape);
|
|
|