#include "content/browser/child_process_security_policy_impl.h"
#include "content/public/common/url_constants.h"
#include "content/test/test_content_browser_client.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_types.h"
#include "testing/gtest/include/gtest/gtest.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_types.h"
namespace content {
namespace {
void CheckHasNoFileSystemFilePermission(ChildProcessSecurityPolicyImpl* p,
const base::FilePath& file,
- const fileapi::FileSystemURL& url) {
+ const storage::FileSystemURL& url) {
EXPECT_FALSE(p->CanReadFile(kRendererID, file));
EXPECT_FALSE(p->CanCreateReadWriteFile(kRendererID, file));
EXPECT_FALSE(p->CanReadFileSystemFile(kRendererID, url));
ChildProcessSecurityPolicyImpl::GetInstance();
p->Add(kRendererID);
- std::string read_id = fileapi::IsolatedContext::GetInstance()->
- RegisterFileSystemForVirtualPath(fileapi::kFileSystemTypeTest,
- "read_filesystem",
- base::FilePath());
- std::string read_write_id = fileapi::IsolatedContext::GetInstance()->
- RegisterFileSystemForVirtualPath(fileapi::kFileSystemTypeTest,
- "read_write_filesystem",
- base::FilePath());
- std::string copy_into_id = fileapi::IsolatedContext::GetInstance()->
- RegisterFileSystemForVirtualPath(fileapi::kFileSystemTypeTest,
- "copy_into_filesystem",
- base::FilePath());
- std::string delete_from_id = fileapi::IsolatedContext::GetInstance()->
- RegisterFileSystemForVirtualPath(fileapi::kFileSystemTypeTest,
- "delete_from_filesystem",
- base::FilePath());
+ std::string read_id =
+ storage::IsolatedContext::GetInstance()->RegisterFileSystemForVirtualPath(
+ storage::kFileSystemTypeTest, "read_filesystem", base::FilePath());
+ std::string read_write_id =
+ storage::IsolatedContext::GetInstance()->RegisterFileSystemForVirtualPath(
+ storage::kFileSystemTypeTest,
+ "read_write_filesystem",
+ base::FilePath());
+ std::string copy_into_id =
+ storage::IsolatedContext::GetInstance()->RegisterFileSystemForVirtualPath(
+ storage::kFileSystemTypeTest,
+ "copy_into_filesystem",
+ base::FilePath());
+ std::string delete_from_id =
+ storage::IsolatedContext::GetInstance()->RegisterFileSystemForVirtualPath(
+ storage::kFileSystemTypeTest,
+ "delete_from_filesystem",
+ base::FilePath());
// Test initially having no permissions.
CheckHasNoFileSystemPermission(p, read_id);
// Cleanup.
p->Remove(kRendererID);
- fileapi::IsolatedContext::GetInstance()->RevokeFileSystem(read_id);
- fileapi::IsolatedContext::GetInstance()->RevokeFileSystem(read_write_id);
- fileapi::IsolatedContext::GetInstance()->RevokeFileSystem(copy_into_id);
- fileapi::IsolatedContext::GetInstance()->RevokeFileSystem(delete_from_id);
+ storage::IsolatedContext::GetInstance()->RevokeFileSystem(read_id);
+ storage::IsolatedContext::GetInstance()->RevokeFileSystem(read_write_id);
+ storage::IsolatedContext::GetInstance()->RevokeFileSystem(copy_into_id);
+ storage::IsolatedContext::GetInstance()->RevokeFileSystem(delete_from_id);
}
TEST_F(ChildProcessSecurityPolicyTest, FilePermissionGrantingAndRevoking) {
ChildProcessSecurityPolicyImpl::GetInstance();
p->RegisterFileSystemPermissionPolicy(
- fileapi::kFileSystemTypeTest,
- fileapi::FILE_PERMISSION_USE_FILE_PERMISSION);
+ storage::kFileSystemTypeTest,
+ storage::FILE_PERMISSION_USE_FILE_PERMISSION);
p->Add(kRendererID);
base::FilePath file(TEST_PATH("/dir/testfile"));
file = file.NormalizePathSeparators();
- fileapi::FileSystemURL url = fileapi::FileSystemURL::CreateForTest(
- GURL("http://foo/"), fileapi::kFileSystemTypeTest, file);
+ storage::FileSystemURL url = storage::FileSystemURL::CreateForTest(
+ GURL("http://foo/"), storage::kFileSystemTypeTest, file);
// Test initially having no permissions.
CheckHasNoFileSystemFilePermission(p, file, url);