Index: content/browser/child_process_security_policy_impl.h |
diff --git a/content/browser/child_process_security_policy_impl.h b/content/browser/child_process_security_policy_impl.h |
index 9699215b3ea0f7bf6a02615532bb0b59bfe78d5c..92c5f3d83e0f1d5889b8a60c6a7c23b17f0557eb 100644 |
--- a/content/browser/child_process_security_policy_impl.h |
+++ b/content/browser/child_process_security_policy_impl.h |
@@ -16,7 +16,7 @@ |
#include "base/synchronization/lock.h" |
#include "content/public/browser/child_process_security_policy.h" |
#include "content/public/common/resource_type.h" |
-#include "webkit/common/fileapi/file_system_types.h" |
+#include "storage/common/fileapi/file_system_types.h" |
class GURL; |
@@ -24,7 +24,7 @@ namespace base { |
class FilePath; |
} |
-namespace fileapi { |
+namespace storage { |
class FileSystemURL; |
} |
@@ -143,15 +143,14 @@ class CONTENT_EXPORT ChildProcessSecurityPolicyImpl |
ResourceType resource_type); |
// Explicit permissions checks for FileSystemURL specified files. |
- bool CanReadFileSystemFile(int child_id, const fileapi::FileSystemURL& url); |
- bool CanWriteFileSystemFile(int child_id, const fileapi::FileSystemURL& url); |
- bool CanCreateFileSystemFile(int child_id, const fileapi::FileSystemURL& url); |
+ bool CanReadFileSystemFile(int child_id, const storage::FileSystemURL& url); |
+ bool CanWriteFileSystemFile(int child_id, const storage::FileSystemURL& url); |
+ bool CanCreateFileSystemFile(int child_id, const storage::FileSystemURL& url); |
bool CanCreateReadWriteFileSystemFile(int child_id, |
- const fileapi::FileSystemURL& url); |
+ const storage::FileSystemURL& url); |
bool CanCopyIntoFileSystemFile(int child_id, |
- const fileapi::FileSystemURL& url); |
- bool CanDeleteFileSystemFile(int child_id, |
- const fileapi::FileSystemURL& url); |
+ const storage::FileSystemURL& url); |
+ bool CanDeleteFileSystemFile(int child_id, const storage::FileSystemURL& url); |
// Returns true if the specified child_id has been granted ReadRawCookies. |
bool CanReadRawCookies(int child_id); |
@@ -177,10 +176,9 @@ class CONTENT_EXPORT ChildProcessSecurityPolicyImpl |
// Register FileSystem type and permission policy which should be used |
// for the type. The |policy| must be a bitwise-or'd value of |
- // fileapi::FilePermissionPolicy. |
- void RegisterFileSystemPermissionPolicy( |
- fileapi::FileSystemType type, |
- int policy); |
+ // storage::FilePermissionPolicy. |
+ void RegisterFileSystemPermissionPolicy(storage::FileSystemType type, |
+ int policy); |
// Returns true if sending system exclusive messages is allowed. |
bool CanSendMidiSysExMessage(int child_id); |
@@ -197,7 +195,7 @@ class CONTENT_EXPORT ChildProcessSecurityPolicyImpl |
typedef std::set<std::string> SchemeSet; |
typedef std::map<int, SecurityState*> SecurityStateMap; |
typedef std::map<int, int> WorkerToMainProcessMap; |
- typedef std::map<fileapi::FileSystemType, int> FileSystemPermissionPolicyMap; |
+ typedef std::map<storage::FileSystemType, int> FileSystemPermissionPolicyMap; |
// Obtain an instance of ChildProcessSecurityPolicyImpl via GetInstance(). |
ChildProcessSecurityPolicyImpl(); |
@@ -237,7 +235,7 @@ class CONTENT_EXPORT ChildProcessSecurityPolicyImpl |
// Determines if certain permissions were granted for a file in FileSystem |
// API. |permissions| is an internally defined bit-set. |
bool HasPermissionsForFileSystemFile(int child_id, |
- const fileapi::FileSystemURL& url, |
+ const storage::FileSystemURL& url, |
int permissions); |
// Determines if certain permissions were granted for a file system. |