Index: content/browser/child_process_security_policy_impl.cc |
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc |
index 6ffe46f185e26edf01d8a76f65a08a62710d16f1..3de8609796dac7f8def6c6bf26c5b90a3f2c0edf 100644 |
--- a/content/browser/child_process_security_policy_impl.cc |
+++ b/content/browser/child_process_security_policy_impl.cc |
@@ -21,10 +21,10 @@ |
#include "net/base/filename_util.h" |
#include "net/url_request/url_request.h" |
#include "url/gurl.h" |
-#include "webkit/browser/fileapi/file_permission_policy.h" |
-#include "webkit/browser/fileapi/file_system_url.h" |
-#include "webkit/browser/fileapi/isolated_context.h" |
-#include "webkit/common/fileapi/file_system_util.h" |
+#include "storage/browser/fileapi/file_permission_policy.h" |
+#include "storage/browser/fileapi/file_system_url.h" |
+#include "storage/browser/fileapi/isolated_context.h" |
+#include "storage/common/fileapi/file_system_util.h" |
namespace content { |
@@ -76,8 +76,8 @@ class ChildProcessSecurityPolicyImpl::SecurityState { |
~SecurityState() { |
scheme_policy_.clear(); |
- fileapi::IsolatedContext* isolated_context = |
- fileapi::IsolatedContext::GetInstance(); |
+ storage::IsolatedContext* isolated_context = |
+ storage::IsolatedContext::GetInstance(); |
for (FileSystemMap::iterator iter = filesystem_permissions_.begin(); |
iter != filesystem_permissions_.end(); |
++iter) { |
@@ -121,7 +121,7 @@ class ChildProcessSecurityPolicyImpl::SecurityState { |
void GrantPermissionsForFileSystem(const std::string& filesystem_id, |
int permissions) { |
if (!ContainsKey(filesystem_permissions_, filesystem_id)) |
- fileapi::IsolatedContext::GetInstance()->AddReference(filesystem_id); |
+ storage::IsolatedContext::GetInstance()->AddReference(filesystem_id); |
filesystem_permissions_[filesystem_id] |= permissions; |
} |
@@ -697,7 +697,9 @@ bool ChildProcessSecurityPolicyImpl::HasPermissionsForFile( |
} |
bool ChildProcessSecurityPolicyImpl::HasPermissionsForFileSystemFile( |
- int child_id, const fileapi::FileSystemURL& url, int permissions) { |
+ int child_id, |
+ const storage::FileSystemURL& url, |
+ int permissions) { |
if (!url.is_valid()) |
return false; |
@@ -705,12 +707,12 @@ bool ChildProcessSecurityPolicyImpl::HasPermissionsForFileSystemFile( |
return false; |
// Any write access is disallowed on the root path. |
- if (fileapi::VirtualPath::IsRootPath(url.path()) && |
+ if (storage::VirtualPath::IsRootPath(url.path()) && |
(permissions & ~READ_FILE_GRANT)) { |
return false; |
} |
- if (url.mount_type() == fileapi::kFileSystemTypeIsolated) { |
+ if (url.mount_type() == storage::kFileSystemTypeIsolated) { |
// When Isolated filesystems is overlayed on top of another filesystem, |
// its per-filesystem permission overrides the underlying filesystem |
// permissions). |
@@ -723,15 +725,15 @@ bool ChildProcessSecurityPolicyImpl::HasPermissionsForFileSystemFile( |
if (found == file_system_policy_map_.end()) |
return false; |
- if ((found->second & fileapi::FILE_PERMISSION_READ_ONLY) && |
+ if ((found->second & storage::FILE_PERMISSION_READ_ONLY) && |
permissions & ~READ_FILE_GRANT) { |
return false; |
} |
- if (found->second & fileapi::FILE_PERMISSION_USE_FILE_PERMISSION) |
+ if (found->second & storage::FILE_PERMISSION_USE_FILE_PERMISSION) |
return HasPermissionsForFile(child_id, url.path(), permissions); |
- if (found->second & fileapi::FILE_PERMISSION_SANDBOX) |
+ if (found->second & storage::FILE_PERMISSION_SANDBOX) |
return true; |
return false; |
@@ -739,38 +741,38 @@ bool ChildProcessSecurityPolicyImpl::HasPermissionsForFileSystemFile( |
bool ChildProcessSecurityPolicyImpl::CanReadFileSystemFile( |
int child_id, |
- const fileapi::FileSystemURL& url) { |
+ const storage::FileSystemURL& url) { |
return HasPermissionsForFileSystemFile(child_id, url, READ_FILE_GRANT); |
} |
bool ChildProcessSecurityPolicyImpl::CanWriteFileSystemFile( |
int child_id, |
- const fileapi::FileSystemURL& url) { |
+ const storage::FileSystemURL& url) { |
return HasPermissionsForFileSystemFile(child_id, url, WRITE_FILE_GRANT); |
} |
bool ChildProcessSecurityPolicyImpl::CanCreateFileSystemFile( |
int child_id, |
- const fileapi::FileSystemURL& url) { |
+ const storage::FileSystemURL& url) { |
return HasPermissionsForFileSystemFile(child_id, url, CREATE_NEW_FILE_GRANT); |
} |
bool ChildProcessSecurityPolicyImpl::CanCreateReadWriteFileSystemFile( |
int child_id, |
- const fileapi::FileSystemURL& url) { |
+ const storage::FileSystemURL& url) { |
return HasPermissionsForFileSystemFile(child_id, url, |
CREATE_READ_WRITE_FILE_GRANT); |
} |
bool ChildProcessSecurityPolicyImpl::CanCopyIntoFileSystemFile( |
int child_id, |
- const fileapi::FileSystemURL& url) { |
+ const storage::FileSystemURL& url) { |
return HasPermissionsForFileSystemFile(child_id, url, COPY_INTO_FILE_GRANT); |
} |
bool ChildProcessSecurityPolicyImpl::CanDeleteFileSystemFile( |
int child_id, |
- const fileapi::FileSystemURL& url) { |
+ const storage::FileSystemURL& url) { |
return HasPermissionsForFileSystemFile(child_id, url, DELETE_FILE_GRANT); |
} |
@@ -875,7 +877,7 @@ bool ChildProcessSecurityPolicyImpl::HasPermissionsForFileSystem( |
} |
void ChildProcessSecurityPolicyImpl::RegisterFileSystemPermissionPolicy( |
- fileapi::FileSystemType type, |
+ storage::FileSystemType type, |
int policy) { |
base::AutoLock lock(lock_); |
file_system_policy_map_[type] = policy; |