diff options
44 files changed, 735 insertions, 548 deletions
diff --git a/chrome/browser/chromeos/drive/file_system_util_unittest.cc b/chrome/browser/chromeos/drive/file_system_util_unittest.cc index e82499a..0fa9443 100644 --- a/chrome/browser/chromeos/drive/file_system_util_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_util_unittest.cc @@ -104,7 +104,7 @@ TEST(FileSystemUtilTest, ExtractDrivePathFromFileSystemUrl) { NULL, // quota_manager_proxy, ScopedVector<fileapi::FileSystemBackend>(), temp_dir_.path(), // partition_path - fileapi::CreateAllowFileAccessOptions())); + content::CreateAllowFileAccessOptions())); // Type:"external" + virtual_path:"drive/foo/bar" resolves to "drive/foo/bar". const std::string& drive_mount_name = diff --git a/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc index 54b5c14..1233aaf 100644 --- a/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc @@ -215,7 +215,7 @@ class IPhotoFileUtilTest : public testing::Test { NULL, additional_providers.Pass(), profile_dir_.path(), - fileapi::CreateAllowFileAccessOptions()); + content::CreateAllowFileAccessOptions()); } protected: diff --git a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc index e0e4a9c..0193fa4 100644 --- a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc @@ -183,7 +183,7 @@ class ItunesFileUtilTest : public testing::Test { NULL, additional_providers.Pass(), profile_dir_.path(), - fileapi::CreateAllowFileAccessOptions()); + content::CreateAllowFileAccessOptions()); } protected: diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc index 5369338..b591076 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc +++ b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc @@ -108,12 +108,12 @@ class MediaFileValidatorTest : public InProcessBrowserTest { ASSERT_TRUE(base::CreateDirectory(src_path)); ScopedVector<fileapi::FileSystemBackend> additional_providers; - additional_providers.push_back(new fileapi::TestFileSystemBackend( + additional_providers.push_back(new content::TestFileSystemBackend( base::MessageLoopProxy::current().get(), src_path)); additional_providers.push_back(new MediaFileSystemBackend( base, base::MessageLoopProxy::current().get())); file_system_context_ = - fileapi::CreateFileSystemContextWithAdditionalProvidersForTesting( + content::CreateFileSystemContextWithAdditionalProvidersForTesting( NULL, additional_providers.Pass(), base); move_src_ = file_system_context_->CreateCrackedFileSystemURL( diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc index dbc1b14..b877d89 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc @@ -134,7 +134,7 @@ class NativeMediaFileUtilTest : public testing::Test { NULL, additional_providers.Pass(), data_dir_.path(), - fileapi::CreateAllowFileAccessOptions()); + content::CreateAllowFileAccessOptions()); filesystem_id_ = isolated_context()->RegisterFileSystemForPath( fileapi::kFileSystemTypeNativeMedia, root_path(), NULL); diff --git a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc index 21bfe39..bb91cf1 100644 --- a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc @@ -251,7 +251,7 @@ class PicasaFileUtilTest : public testing::Test { NULL, additional_providers.Pass(), profile_dir_.path(), - fileapi::CreateAllowFileAccessOptions()); + content::CreateAllowFileAccessOptions()); } virtual void TearDown() OVERRIDE { diff --git a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc b/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc index a7bff60..1b4f065 100644 --- a/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc +++ b/chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc @@ -20,11 +20,11 @@ #include "webkit/common/quota/quota_types.h" using base::PlatformFileError; +using content::SandboxFileSystemTestHelper; using fileapi::FileSystemContext; using fileapi::FileSystemOperationContext; using fileapi::FileSystemURL; using fileapi::FileSystemURLSet; -using fileapi::SandboxFileSystemTestHelper; using quota::QuotaManager; using quota::QuotaStatusCode; diff --git a/content/browser/fileapi/blob_url_request_job_unittest.cc b/content/browser/fileapi/blob_url_request_job_unittest.cc index cd29aaf..e79b033 100644 --- a/content/browser/fileapi/blob_url_request_job_unittest.cc +++ b/content/browser/fileapi/blob_url_request_job_unittest.cc @@ -29,7 +29,10 @@ #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/common/blob/blob_data.h" -namespace webkit_blob { +using webkit_blob::BlobData; +using webkit_blob::BlobURLRequestJob; + +namespace content { namespace { @@ -169,7 +172,7 @@ class BlobURLRequestJobTest : public testing::Test { void SetUpFileSystem() { // Prepare file system. - file_system_context_ = fileapi::CreateFileSystemContextForTesting( + file_system_context_ = CreateFileSystemContextForTesting( NULL, temp_dir_.path()); file_system_context_->OpenFileSystem( @@ -474,4 +477,4 @@ TEST_F(BlobURLRequestJobTest, TestExtraHeaders) { EXPECT_EQ(kTestContentDisposition, content_disposition); } -} // namespace webkit_blob +} // namespace content diff --git a/content/browser/fileapi/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc index 439bbf9..a32920c 100644 --- a/content/browser/fileapi/browser_file_system_helper.cc +++ b/content/browser/fileapi/browser_file_system_helper.cc @@ -53,7 +53,7 @@ scoped_refptr<fileapi::FileSystemContext> CreateFileSystemContext( bool is_incognito, quota::QuotaManagerProxy* quota_manager_proxy) { - base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); + base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); scoped_refptr<base::SequencedTaskRunner> file_task_runner = pool->GetSequencedTaskRunnerWithShutdownBehavior( pool->GetNamedSequenceToken("FileAPI"), diff --git a/content/browser/fileapi/copy_or_move_file_validator_unittest.cc b/content/browser/fileapi/copy_or_move_file_validator_unittest.cc index 1dd3f98..dc6a06a 100644 --- a/content/browser/fileapi/copy_or_move_file_validator_unittest.cc +++ b/content/browser/fileapi/copy_or_move_file_validator_unittest.cc @@ -21,12 +21,18 @@ #include "webkit/common/blob/shareable_file_reference.h" #include "webkit/common/fileapi/file_system_util.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::CopyOrMoveFileValidator; +using fileapi::CopyOrMoveFileValidatorFactory; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; + +namespace content { namespace { -const FileSystemType kNoValidatorType = kFileSystemTypeTemporary; -const FileSystemType kWithValidatorType = kFileSystemTypeTest; +const FileSystemType kNoValidatorType = fileapi::kFileSystemTypeTemporary; +const FileSystemType kWithValidatorType = fileapi::kFileSystemTypeTest; void ExpectOk(const GURL& origin_url, const std::string& name, @@ -56,17 +62,17 @@ class CopyOrMoveFileValidatorTestHelper { file_system_context_ = CreateFileSystemContextForTesting(NULL, base_dir); // Set up TestFileSystemBackend to require CopyOrMoveFileValidator. - FileSystemBackend* test_file_system_backend = + fileapi::FileSystemBackend* test_file_system_backend = file_system_context_->GetFileSystemBackend(kWithValidatorType); static_cast<TestFileSystemBackend*>(test_file_system_backend)-> set_require_copy_or_move_validator(true); // Sets up source. - FileSystemBackend* src_file_system_backend = + fileapi::FileSystemBackend* src_file_system_backend = file_system_context_->GetFileSystemBackend(src_type_); src_file_system_backend->OpenFileSystem( origin_, src_type_, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&ExpectOk)); base::RunLoop().RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, CreateDirectory(SourceURL(""))); @@ -90,7 +96,7 @@ class CopyOrMoveFileValidatorTestHelper { } void SetMediaCopyOrMoveFileValidatorFactory( - scoped_ptr<CopyOrMoveFileValidatorFactory> factory) { + scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) { TestFileSystemBackend* backend = static_cast<TestFileSystemBackend*>( file_system_context_->GetFileSystemBackend(kWithValidatorType)); backend->InitializeCopyOrMoveFileValidatorFactory(factory.Pass()); @@ -170,7 +176,7 @@ class CopyOrMoveFileValidatorTestHelper { std::string dest_fsid_; base::MessageLoop message_loop_; - scoped_refptr<FileSystemContext> file_system_context_; + scoped_refptr<fileapi::FileSystemContext> file_system_context_; FileSystemURL copy_src_; FileSystemURL copy_dest_; @@ -188,7 +194,7 @@ enum Validity { }; class TestCopyOrMoveFileValidatorFactory - : public CopyOrMoveFileValidatorFactory { + : public fileapi::CopyOrMoveFileValidatorFactory { public: // A factory that creates validators that accept everything or nothing. // TODO(gbillock): switch args to enum or something @@ -196,7 +202,7 @@ class TestCopyOrMoveFileValidatorFactory : validity_(validity) {} virtual ~TestCopyOrMoveFileValidatorFactory() {} - virtual CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator( + virtual fileapi::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator( const FileSystemURL& /*src_url*/, const base::FilePath& /*platform_path*/) OVERRIDE { return new TestCopyOrMoveFileValidator(validity_); @@ -323,4 +329,4 @@ TEST(CopyOrMoveFileValidatorTest, RejectPostWrite) { helper.MoveTest(base::PLATFORM_FILE_ERROR_SECURITY); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc index eb002ab..0bed27f 100644 --- a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc +++ b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc @@ -29,9 +29,17 @@ #include "webkit/browser/quota/quota_manager.h" #include "webkit/common/fileapi/file_system_util.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::CopyOrMoveOperationDelegate; +using fileapi::FileStreamWriter; +using fileapi::FileSystemOperation; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; +using fileapi::test::TestCaseRecord; -typedef FileSystemOperation::FileEntryList FileEntryList; +namespace content { + +typedef fileapi::FileSystemOperation::FileEntryList FileEntryList; namespace { @@ -41,13 +49,13 @@ void ExpectOk(const GURL& origin_url, ASSERT_EQ(base::PLATFORM_FILE_OK, error); } -class TestValidatorFactory : public CopyOrMoveFileValidatorFactory { +class TestValidatorFactory : public fileapi::CopyOrMoveFileValidatorFactory { public: // A factory that creates validators that accept everything or nothing. TestValidatorFactory() {} virtual ~TestValidatorFactory() {} - virtual CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator( + virtual fileapi::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator( const FileSystemURL& /*src_url*/, const base::FilePath& /*platform_path*/) OVERRIDE { // Move arg management to TestValidator? @@ -55,7 +63,7 @@ class TestValidatorFactory : public CopyOrMoveFileValidatorFactory { } private: - class TestValidator : public CopyOrMoveFileValidator { + class TestValidator : public fileapi::CopyOrMoveFileValidator { public: explicit TestValidator(bool pre_copy_valid, bool post_copy_valid, @@ -99,14 +107,14 @@ class TestValidatorFactory : public CopyOrMoveFileValidatorFactory { // Records CopyProgressCallback invocations. struct ProgressRecord { - FileSystemOperation::CopyProgressType type; + fileapi::FileSystemOperation::CopyProgressType type; FileSystemURL source_url; FileSystemURL dest_url; int64 size; }; void RecordProgressCallback(std::vector<ProgressRecord>* records, - FileSystemOperation::CopyProgressType type, + fileapi::FileSystemOperation::CopyProgressType type, const FileSystemURL& source_url, const FileSystemURL& dest_url, int64 size) { @@ -197,16 +205,16 @@ class CopyOrMoveOperationTestHelper { CreateFileSystemContextForTesting(quota_manager_proxy_.get(), base_dir); // Prepare the origin's root directory. - FileSystemBackend* backend = + fileapi::FileSystemBackend* backend = file_system_context_->GetFileSystemBackend(src_type_); backend->OpenFileSystem(origin_, src_type_, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&ExpectOk)); backend = file_system_context_->GetFileSystemBackend(dest_type_); - if (dest_type_ == kFileSystemTypeTest) { + if (dest_type_ == fileapi::kFileSystemTypeTest) { TestFileSystemBackend* test_backend = static_cast<TestFileSystemBackend*>(backend); - scoped_ptr<CopyOrMoveFileValidatorFactory> factory( + scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory( new TestValidatorFactory); test_backend->set_require_copy_or_move_validator( require_copy_or_move_validator); @@ -214,17 +222,19 @@ class CopyOrMoveOperationTestHelper { test_backend->InitializeCopyOrMoveFileValidatorFactory(factory.Pass()); } backend->OpenFileSystem(origin_, dest_type_, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&ExpectOk)); base::RunLoop().RunUntilIdle(); // Grant relatively big quota initially. - quota_manager_->SetQuota(origin_, - FileSystemTypeToQuotaStorageType(src_type_), - 1024 * 1024); - quota_manager_->SetQuota(origin_, - FileSystemTypeToQuotaStorageType(dest_type_), - 1024 * 1024); + quota_manager_->SetQuota( + origin_, + fileapi::FileSystemTypeToQuotaStorageType(src_type_), + 1024 * 1024); + quota_manager_->SetQuota( + origin_, + fileapi::FileSystemTypeToQuotaStorageType(dest_type_), + 1024 * 1024); } int64 GetSourceUsage() { @@ -269,11 +279,11 @@ class CopyOrMoveOperationTestHelper { base::PlatformFileError SetUpTestCaseFiles( const FileSystemURL& root, - const test::TestCaseRecord* const test_cases, + const TestCaseRecord* const test_cases, size_t test_case_size) { base::PlatformFileError result = base::PLATFORM_FILE_ERROR_FAILED; for (size_t i = 0; i < test_case_size; ++i) { - const test::TestCaseRecord& test_case = test_cases[i]; + const TestCaseRecord& test_case = test_cases[i]; FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( root.origin(), root.mount_type(), @@ -291,9 +301,9 @@ class CopyOrMoveOperationTestHelper { void VerifyTestCaseFiles( const FileSystemURL& root, - const test::TestCaseRecord* const test_cases, + const TestCaseRecord* const test_cases, size_t test_case_size) { - std::map<base::FilePath, const test::TestCaseRecord*> test_case_map; + std::map<base::FilePath, const TestCaseRecord*> test_case_map; for (size_t i = 0; i < test_case_size; ++i) { test_case_map[ base::FilePath(test_cases[i].path).NormalizePathSeparators()] = @@ -327,7 +337,7 @@ class CopyOrMoveOperationTestHelper { } } EXPECT_TRUE(test_case_map.empty()); - std::map<base::FilePath, const test::TestCaseRecord*>::const_iterator it; + std::map<base::FilePath, const TestCaseRecord*>::const_iterator it; for (it = test_case_map.begin(); it != test_case_map.end(); ++it) { LOG(ERROR) << "Extra entry: " << it->first.LossyDisplayName(); } @@ -378,7 +388,7 @@ class CopyOrMoveOperationTestHelper { const FileSystemType dest_type_; base::MessageLoopForIO message_loop_; - scoped_refptr<FileSystemContext> file_system_context_; + scoped_refptr<fileapi::FileSystemContext> file_system_context_; scoped_refptr<quota::MockQuotaManagerProxy> quota_manager_proxy_; scoped_refptr<quota::MockQuotaManager> quota_manager_; @@ -387,8 +397,8 @@ class CopyOrMoveOperationTestHelper { TEST(LocalFileSystemCopyOrMoveOperationTest, CopySingleFile) { CopyOrMoveOperationTestHelper helper(GURL("http://foo"), - kFileSystemTypeTemporary, - kFileSystemTypePersistent); + fileapi::kFileSystemTypeTemporary, + fileapi::kFileSystemTypePersistent); helper.SetUp(); FileSystemURL src = helper.SourceURL("a"); @@ -416,8 +426,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, CopySingleFile) { TEST(LocalFileSystemCopyOrMoveOperationTest, MoveSingleFile) { CopyOrMoveOperationTestHelper helper(GURL("http://foo"), - kFileSystemTypeTemporary, - kFileSystemTypePersistent); + fileapi::kFileSystemTypeTemporary, + fileapi::kFileSystemTypePersistent); helper.SetUp(); FileSystemURL src = helper.SourceURL("a"); @@ -445,8 +455,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, MoveSingleFile) { TEST(LocalFileSystemCopyOrMoveOperationTest, CopySingleDirectory) { CopyOrMoveOperationTestHelper helper(GURL("http://foo"), - kFileSystemTypeTemporary, - kFileSystemTypePersistent); + fileapi::kFileSystemTypeTemporary, + fileapi::kFileSystemTypePersistent); helper.SetUp(); FileSystemURL src = helper.SourceURL("a"); @@ -474,8 +484,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, CopySingleDirectory) { TEST(LocalFileSystemCopyOrMoveOperationTest, MoveSingleDirectory) { CopyOrMoveOperationTestHelper helper(GURL("http://foo"), - kFileSystemTypeTemporary, - kFileSystemTypePersistent); + fileapi::kFileSystemTypeTemporary, + fileapi::kFileSystemTypePersistent); helper.SetUp(); FileSystemURL src = helper.SourceURL("a"); @@ -503,8 +513,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, MoveSingleDirectory) { TEST(LocalFileSystemCopyOrMoveOperationTest, CopyDirectory) { CopyOrMoveOperationTestHelper helper(GURL("http://foo"), - kFileSystemTypeTemporary, - kFileSystemTypePersistent); + fileapi::kFileSystemTypeTemporary, + fileapi::kFileSystemTypePersistent); helper.SetUp(); FileSystemURL src = helper.SourceURL("a"); @@ -516,8 +526,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, CopyDirectory) { ASSERT_EQ(base::PLATFORM_FILE_OK, helper.CreateDirectory(src)); ASSERT_EQ(base::PLATFORM_FILE_OK, helper.SetUpTestCaseFiles(src, - test::kRegularTestCases, - test::kRegularTestCaseSize)); + fileapi::test::kRegularTestCases, + fileapi::test::kRegularTestCaseSize)); int64 src_increase = helper.GetSourceUsage() - src_initial_usage; // Copy it. @@ -531,8 +541,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, CopyDirectory) { ASSERT_TRUE(helper.DirectoryExists(dest)); helper.VerifyTestCaseFiles(dest, - test::kRegularTestCases, - test::kRegularTestCaseSize); + fileapi::test::kRegularTestCases, + fileapi::test::kRegularTestCaseSize); int64 src_new_usage = helper.GetSourceUsage(); ASSERT_EQ(src_initial_usage + src_increase, src_new_usage); @@ -543,8 +553,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, CopyDirectory) { TEST(LocalFileSystemCopyOrMoveOperationTest, MoveDirectory) { CopyOrMoveOperationTestHelper helper(GURL("http://foo"), - kFileSystemTypeTemporary, - kFileSystemTypePersistent); + fileapi::kFileSystemTypeTemporary, + fileapi::kFileSystemTypePersistent); helper.SetUp(); FileSystemURL src = helper.SourceURL("a"); @@ -556,8 +566,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, MoveDirectory) { ASSERT_EQ(base::PLATFORM_FILE_OK, helper.CreateDirectory(src)); ASSERT_EQ(base::PLATFORM_FILE_OK, helper.SetUpTestCaseFiles(src, - test::kRegularTestCases, - test::kRegularTestCaseSize)); + fileapi::test::kRegularTestCases, + fileapi::test::kRegularTestCaseSize)); int64 src_increase = helper.GetSourceUsage() - src_initial_usage; // Move it. @@ -568,8 +578,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, MoveDirectory) { ASSERT_TRUE(helper.DirectoryExists(dest)); helper.VerifyTestCaseFiles(dest, - test::kRegularTestCases, - test::kRegularTestCaseSize); + fileapi::test::kRegularTestCases, + fileapi::test::kRegularTestCaseSize); int64 src_new_usage = helper.GetSourceUsage(); ASSERT_EQ(src_initial_usage, src_new_usage); @@ -581,8 +591,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, MoveDirectory) { TEST(LocalFileSystemCopyOrMoveOperationTest, MoveDirectoryFailPostWriteValidation) { CopyOrMoveOperationTestHelper helper(GURL("http://foo"), - kFileSystemTypeTemporary, - kFileSystemTypeTest); + fileapi::kFileSystemTypeTemporary, + fileapi::kFileSystemTypeTest); helper.SetUp(); FileSystemURL src = helper.SourceURL("a"); @@ -592,8 +602,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, ASSERT_EQ(base::PLATFORM_FILE_OK, helper.CreateDirectory(src)); ASSERT_EQ(base::PLATFORM_FILE_OK, helper.SetUpTestCaseFiles(src, - test::kRegularTestCases, - test::kRegularTestCaseSize)); + fileapi::test::kRegularTestCases, + fileapi::test::kRegularTestCaseSize)); // Move it. helper.Move(src, dest); @@ -602,7 +612,7 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, ASSERT_TRUE(helper.DirectoryExists(src)); ASSERT_TRUE(helper.DirectoryExists(dest)); - test::TestCaseRecord kMoveDirResultCases[] = { + TestCaseRecord kMoveDirResultCases[] = { {false, FILE_PATH_LITERAL("file 0"), 38}, {false, FILE_PATH_LITERAL("file 3"), 0}, }; @@ -614,8 +624,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, TEST(LocalFileSystemCopyOrMoveOperationTest, CopySingleFileNoValidator) { CopyOrMoveOperationTestHelper helper(GURL("http://foo"), - kFileSystemTypeTemporary, - kFileSystemTypeTest); + fileapi::kFileSystemTypeTemporary, + fileapi::kFileSystemTypeTest); helper.SetUpNoValidator(); FileSystemURL src = helper.SourceURL("a"); @@ -632,8 +642,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, CopySingleFileNoValidator) { TEST(LocalFileSystemCopyOrMoveOperationTest, ProgressCallback) { CopyOrMoveOperationTestHelper helper(GURL("http://foo"), - kFileSystemTypeTemporary, - kFileSystemTypePersistent); + fileapi::kFileSystemTypeTemporary, + fileapi::kFileSystemTypePersistent); helper.SetUp(); FileSystemURL src = helper.SourceURL("a"); @@ -643,8 +653,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, ProgressCallback) { ASSERT_EQ(base::PLATFORM_FILE_OK, helper.CreateDirectory(src)); ASSERT_EQ(base::PLATFORM_FILE_OK, helper.SetUpTestCaseFiles(src, - test::kRegularTestCases, - test::kRegularTestCaseSize)); + fileapi::test::kRegularTestCases, + fileapi::test::kRegularTestCaseSize)); std::vector<ProgressRecord> records; ASSERT_EQ(base::PLATFORM_FILE_OK, @@ -653,8 +663,8 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, ProgressCallback) { base::Unretained(&records)))); // Verify progress callback. - for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) { - const test::TestCaseRecord& test_case = test::kRegularTestCases[i]; + for (size_t i = 0; i < fileapi::test::kRegularTestCaseSize; ++i) { + const TestCaseRecord& test_case = fileapi::test::kRegularTestCases[i]; FileSystemURL src_url = helper.SourceURL( std::string("a/") + base::FilePath(test_case.path).AsUTF8Unsafe()); @@ -863,4 +873,4 @@ TEST(LocalFileSystemCopyOrMoveOperationTest, StreamCopyHelper_Cancel) { EXPECT_EQ(base::PLATFORM_FILE_ERROR_ABORT, error); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/dragged_file_util_unittest.cc b/content/browser/fileapi/dragged_file_util_unittest.cc index d35ac4c..d54504c 100644 --- a/content/browser/fileapi/dragged_file_util_unittest.cc +++ b/content/browser/fileapi/dragged_file_util_unittest.cc @@ -26,7 +26,13 @@ #include "webkit/browser/fileapi/native_file_util.h" #include "webkit/browser/fileapi/test_file_set.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::FileSystemContext; +using fileapi::FileSystemOperationContext; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; + +namespace content { namespace { @@ -94,7 +100,7 @@ class DraggedFileUtilTest : public testing::Test { virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); ASSERT_TRUE(partition_dir_.CreateUniqueTempDir()); - file_util_.reset(new DraggedFileUtil()); + file_util_.reset(new fileapi::DraggedFileUtil()); // Register the files/directories of RegularTestCases (with random // root paths) as dropped files. @@ -112,8 +118,8 @@ class DraggedFileUtilTest : public testing::Test { } protected: - IsolatedContext* isolated_context() const { - return IsolatedContext::GetInstance(); + fileapi::IsolatedContext* isolated_context() const { + return fileapi::IsolatedContext::GetInstance(); } const base::FilePath& root_path() const { return data_dir_.path(); @@ -121,7 +127,7 @@ class DraggedFileUtilTest : public testing::Test { FileSystemContext* file_system_context() const { return file_system_context_.get(); } - FileSystemFileUtil* file_util() const { return file_util_.get(); } + fileapi::FileSystemFileUtil* file_util() const { return file_util_.get(); } std::string filesystem_id() const { return filesystem_id_; } base::FilePath GetTestCasePlatformPath( @@ -142,14 +148,14 @@ class DraggedFileUtilTest : public testing::Test { filesystem_id()).Append(path); return file_system_context_->CreateCrackedFileSystemURL( GURL("http://example.com"), - kFileSystemTypeIsolated, + fileapi::kFileSystemTypeIsolated, virtual_path); } FileSystemURL GetOtherFileSystemURL(const base::FilePath& path) const { return file_system_context()->CreateCrackedFileSystemURL( GURL("http://example.com"), - kFileSystemTypeTemporary, + fileapi::kFileSystemTypeTemporary, base::FilePath().AppendASCII("dest").Append(path)); } @@ -241,9 +247,9 @@ class DraggedFileUtilTest : public testing::Test { } } - scoped_ptr<FileSystemOperationContext> GetOperationContext() { + scoped_ptr<fileapi::FileSystemOperationContext> GetOperationContext() { return make_scoped_ptr( - new FileSystemOperationContext(file_system_context())).Pass(); + new fileapi::FileSystemOperationContext(file_system_context())).Pass(); } @@ -251,9 +257,10 @@ class DraggedFileUtilTest : public testing::Test { void SimulateDropFiles() { size_t root_path_index = 0; - IsolatedContext::FileInfoSet toplevels; - for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) { - const test::TestCaseRecord& test_case = test::kRegularTestCases[i]; + fileapi::IsolatedContext::FileInfoSet toplevels; + for (size_t i = 0; i < fileapi::test::kRegularTestCaseSize; ++i) { + const fileapi::test::TestCaseRecord& test_case = + fileapi::test::kRegularTestCases[i]; base::FilePath path(test_case.path); base::FilePath toplevel = GetTopLevelPath(path); @@ -266,7 +273,7 @@ class DraggedFileUtilTest : public testing::Test { toplevels.AddPath(root.Append(path), NULL); } - test::SetUpOneTestCase(toplevel_root_map_[toplevel], test_case); + fileapi::test::SetUpOneTestCase(toplevel_root_map_[toplevel], test_case); } // Register the toplevel entries. @@ -279,14 +286,15 @@ class DraggedFileUtilTest : public testing::Test { std::string filesystem_id_; scoped_refptr<FileSystemContext> file_system_context_; std::map<base::FilePath, base::FilePath> toplevel_root_map_; - scoped_ptr<DraggedFileUtil> file_util_; + scoped_ptr<fileapi::DraggedFileUtil> file_util_; DISALLOW_COPY_AND_ASSIGN(DraggedFileUtilTest); }; TEST_F(DraggedFileUtilTest, BasicTest) { - for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) { + for (size_t i = 0; i < fileapi::test::kRegularTestCaseSize; ++i) { SCOPED_TRACE(testing::Message() << "Testing RegularTestCases " << i); - const test::TestCaseRecord& test_case = test::kRegularTestCases[i]; + const fileapi::test::TestCaseRecord& test_case = + fileapi::test::kRegularTestCases[i]; FileSystemURL url = GetFileSystemURL(base::FilePath(test_case.path)); @@ -319,7 +327,7 @@ TEST_F(DraggedFileUtilTest, UnregisteredPathsTest) { for (size_t i = 0; i < arraysize(kUnregisteredCases); ++i) { SCOPED_TRACE(testing::Message() << "Creating kUnregisteredCases " << i); - const test::TestCaseRecord& test_case = kUnregisteredCases[i]; + const fileapi::test::TestCaseRecord& test_case = kUnregisteredCases[i]; // Prepare the test file/directory. SetUpOneTestCase(root_path(), test_case); @@ -334,7 +342,7 @@ TEST_F(DraggedFileUtilTest, UnregisteredPathsTest) { for (size_t i = 0; i < arraysize(kUnregisteredCases); ++i) { SCOPED_TRACE(testing::Message() << "Creating kUnregisteredCases " << i); - const test::TestCaseRecord& test_case = kUnregisteredCases[i]; + const fileapi::test::TestCaseRecord& test_case = kUnregisteredCases[i]; FileSystemURL url = GetFileSystemURL(base::FilePath(test_case.path)); // We should not be able to get the valid URL for unregistered files. @@ -343,8 +351,9 @@ TEST_F(DraggedFileUtilTest, UnregisteredPathsTest) { } TEST_F(DraggedFileUtilTest, ReadDirectoryTest) { - for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) { - const test::TestCaseRecord& test_case = test::kRegularTestCases[i]; + for (size_t i = 0; i < fileapi::test::kRegularTestCaseSize; ++i) { + const fileapi::test::TestCaseRecord& test_case = + fileapi::test::kRegularTestCases[i]; if (!test_case.is_directory) continue; @@ -352,7 +361,8 @@ TEST_F(DraggedFileUtilTest, ReadDirectoryTest) { << ": " << test_case.path); // Read entries in the directory to construct the expected results map. - typedef std::map<base::FilePath::StringType, DirectoryEntry> EntryMap; + typedef std::map<base::FilePath::StringType, fileapi::DirectoryEntry> + EntryMap; EntryMap expected_entry_map; base::FilePath dir_path = GetTestCasePlatformPath(test_case.path); @@ -362,7 +372,7 @@ TEST_F(DraggedFileUtilTest, ReadDirectoryTest) { base::FilePath current; while (!(current = file_enum.Next()).empty()) { base::FileEnumerator::FileInfo file_info = file_enum.GetInfo(); - DirectoryEntry entry; + fileapi::DirectoryEntry entry; entry.is_directory = file_info.IsDirectory(); entry.name = current.BaseName().value(); entry.size = file_info.GetSize(); @@ -389,7 +399,7 @@ TEST_F(DraggedFileUtilTest, ReadDirectoryTest) { EXPECT_EQ(expected_entry_map.size(), entries.size()); for (size_t i = 0; i < entries.size(); ++i) { - const DirectoryEntry& entry = entries[i]; + const fileapi::DirectoryEntry& entry = entries[i]; EntryMap::iterator found = expected_entry_map.find(entry.name); EXPECT_TRUE(found != expected_entry_map.end()); EXPECT_EQ(found->second.name, entry.name); @@ -402,8 +412,9 @@ TEST_F(DraggedFileUtilTest, ReadDirectoryTest) { } TEST_F(DraggedFileUtilTest, GetLocalFilePathTest) { - for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) { - const test::TestCaseRecord& test_case = test::kRegularTestCases[i]; + for (size_t i = 0; i < fileapi::test::kRegularTestCaseSize; ++i) { + const fileapi::test::TestCaseRecord& test_case = + fileapi::test::kRegularTestCases[i]; FileSystemURL url = GetFileSystemURL(base::FilePath(test_case.path)); FileSystemOperationContext context(file_system_context()); @@ -486,8 +497,9 @@ TEST_F(DraggedFileUtilTest, CopyOutDirectoryTest) { } TEST_F(DraggedFileUtilTest, TouchTest) { - for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) { - const test::TestCaseRecord& test_case = test::kRegularTestCases[i]; + for (size_t i = 0; i < fileapi::test::kRegularTestCaseSize; ++i) { + const fileapi::test::TestCaseRecord& test_case = + fileapi::test::kRegularTestCases[i]; if (test_case.is_directory) continue; SCOPED_TRACE(testing::Message() << test_case.path); @@ -513,8 +525,9 @@ TEST_F(DraggedFileUtilTest, TouchTest) { } TEST_F(DraggedFileUtilTest, TruncateTest) { - for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) { - const test::TestCaseRecord& test_case = test::kRegularTestCases[i]; + for (size_t i = 0; i < fileapi::test::kRegularTestCaseSize; ++i) { + const fileapi::test::TestCaseRecord& test_case = + fileapi::test::kRegularTestCases[i]; if (test_case.is_directory) continue; @@ -541,4 +554,4 @@ TEST_F(DraggedFileUtilTest, TruncateTest) { } } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/file_system_context_unittest.cc b/content/browser/fileapi/file_system_context_unittest.cc index 43003ad..f989ed7 100644 --- a/content/browser/fileapi/file_system_context_unittest.cc +++ b/content/browser/fileapi/file_system_context_unittest.cc @@ -23,7 +23,15 @@ #define DRIVE #endif -namespace fileapi { +using fileapi::ExternalMountPoints; +using fileapi::FileSystemBackend; +using fileapi::FileSystemContext; +using fileapi::FileSystemMountOption; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; +using fileapi::IsolatedContext; + +namespace content { namespace { @@ -57,7 +65,7 @@ class FileSystemContextTest : public testing::Test { protected: FileSystemContext* CreateFileSystemContextForTest( - ExternalMountPoints* external_mount_points) { + fileapi::ExternalMountPoints* external_mount_points) { return new FileSystemContext(base::MessageLoopProxy::current().get(), base::MessageLoopProxy::current().get(), external_mount_points, @@ -104,13 +112,13 @@ TEST_F(FileSystemContextTest, NullExternalMountPoints) { std::string isolated_name = "root"; std::string isolated_id = IsolatedContext::GetInstance()->RegisterFileSystemForPath( - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeNativeLocal, base::FilePath(DRIVE FPL("/test/isolated/root")), &isolated_name); // Register system external mount point. ASSERT_TRUE(ExternalMountPoints::GetSystemInstance()->RegisterFileSystem( "system", - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeNativeLocal, FileSystemMountOption(), base::FilePath(DRIVE FPL("/test/sys/")))); @@ -120,8 +128,8 @@ TEST_F(FileSystemContextTest, NullExternalMountPoints) { ExpectFileSystemURLMatches( cracked_isolated, GURL(kTestOrigin), - kFileSystemTypeIsolated, - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeIsolated, + fileapi::kFileSystemTypeNativeLocal, base::FilePath( DRIVE FPL("/test/isolated/root/file")).NormalizePathSeparators(), base::FilePath::FromUTF8Unsafe(isolated_id).Append(FPL("root/file")). @@ -134,8 +142,8 @@ TEST_F(FileSystemContextTest, NullExternalMountPoints) { ExpectFileSystemURLMatches( cracked_external, GURL(kTestOrigin), - kFileSystemTypeExternal, - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeExternal, + fileapi::kFileSystemTypeNativeLocal, base::FilePath( DRIVE FPL("/test/sys/root/file")).NormalizePathSeparators(), base::FilePath(FPL("system/root/file")).NormalizePathSeparators(), @@ -154,7 +162,7 @@ TEST_F(FileSystemContextTest, FileSystemContextKeepsMountPointsAlive) { // Register system external mount point. ASSERT_TRUE(mount_points->RegisterFileSystem( "system", - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeNativeLocal, FileSystemMountOption(), base::FilePath(DRIVE FPL("/test/sys/")))); @@ -172,8 +180,8 @@ TEST_F(FileSystemContextTest, FileSystemContextKeepsMountPointsAlive) { ExpectFileSystemURLMatches( cracked_external, GURL(kTestOrigin), - kFileSystemTypeExternal, - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeExternal, + fileapi::kFileSystemTypeNativeLocal, base::FilePath( DRIVE FPL("/test/sys/root/file")).NormalizePathSeparators(), base::FilePath(FPL("system/root/file")).NormalizePathSeparators(), @@ -193,32 +201,32 @@ TEST_F(FileSystemContextTest, CrackFileSystemURL) { std::string isolated_file_system_name = "root"; const std::string kIsolatedFileSystemID = IsolatedContext::GetInstance()->RegisterFileSystemForPath( - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeNativeLocal, base::FilePath(DRIVE FPL("/test/isolated/root")), &isolated_file_system_name); // Register system external mount point. ASSERT_TRUE(ExternalMountPoints::GetSystemInstance()->RegisterFileSystem( "system", - kFileSystemTypeDrive, + fileapi::kFileSystemTypeDrive, FileSystemMountOption(), base::FilePath(DRIVE FPL("/test/sys/")))); ASSERT_TRUE(ExternalMountPoints::GetSystemInstance()->RegisterFileSystem( "ext", - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeNativeLocal, FileSystemMountOption(), base::FilePath(DRIVE FPL("/test/ext")))); // Register a system external mount point with the same name/id as the // registered isolated mount point. ASSERT_TRUE(ExternalMountPoints::GetSystemInstance()->RegisterFileSystem( kIsolatedFileSystemID, - kFileSystemTypeRestrictedNativeLocal, + fileapi::kFileSystemTypeRestrictedNativeLocal, FileSystemMountOption(), base::FilePath(DRIVE FPL("/test/system/isolated")))); // Add a mount points with the same name as a system mount point to // FileSystemContext's external mount points. ASSERT_TRUE(external_mount_points->RegisterFileSystem( "ext", - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeNativeLocal, FileSystemMountOption(), base::FilePath(DRIVE FPL("/test/local/ext/")))); @@ -242,40 +250,41 @@ TEST_F(FileSystemContextTest, CrackFileSystemURL) { // Following should not be handled by the url crackers: { "pers_mount", "persistent", true /* is_valid */, - kFileSystemTypePersistent, kFileSystemTypePersistent, + fileapi::kFileSystemTypePersistent, fileapi::kFileSystemTypePersistent, FPL("pers_mount/root/file"), std::string() /* filesystem id */ }, { "temp_mount", "temporary", true /* is_valid */, - kFileSystemTypeTemporary, kFileSystemTypeTemporary, + fileapi::kFileSystemTypeTemporary, fileapi::kFileSystemTypeTemporary, FPL("temp_mount/root/file"), std::string() /* filesystem id */ }, // Should be cracked by isolated mount points: { kIsolatedFileSystemID, "isolated", true /* is_valid */, - kFileSystemTypeIsolated, kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeIsolated, fileapi::kFileSystemTypeNativeLocal, DRIVE FPL("/test/isolated/root/file"), kIsolatedFileSystemID }, // Should be cracked by system mount points: { "system", "external", true /* is_valid */, - kFileSystemTypeExternal, kFileSystemTypeDrive, + fileapi::kFileSystemTypeExternal, fileapi::kFileSystemTypeDrive, DRIVE FPL("/test/sys/root/file"), "system" }, { kIsolatedFileSystemID, "external", true /* is_valid */, - kFileSystemTypeExternal, kFileSystemTypeRestrictedNativeLocal, + fileapi::kFileSystemTypeExternal, + fileapi::kFileSystemTypeRestrictedNativeLocal, DRIVE FPL("/test/system/isolated/root/file"), kIsolatedFileSystemID }, // Should be cracked by FileSystemContext's ExternalMountPoints. { "ext", "external", true /* is_valid */, - kFileSystemTypeExternal, kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeExternal, fileapi::kFileSystemTypeNativeLocal, DRIVE FPL("/test/local/ext/root/file"), "ext" }, @@ -284,15 +293,15 @@ TEST_F(FileSystemContextTest, CrackFileSystemURL) { { "sytem", "external", false /* is_valid */, // The rest of values will be ignored. - kFileSystemTypeUnknown, kFileSystemTypeUnknown, FPL(""), - std::string() + fileapi::kFileSystemTypeUnknown, fileapi::kFileSystemTypeUnknown, + FPL(""), std::string() }, // Test for URL with non-existing filesystem id. { "invalid", "external", false /* is_valid */, // The rest of values will be ignored. - kFileSystemTypeUnknown, kFileSystemTypeUnknown, FPL(""), - std::string() + fileapi::kFileSystemTypeUnknown, fileapi::kFileSystemTypeUnknown, + FPL(""), std::string() }, }; @@ -339,29 +348,30 @@ TEST_F(FileSystemContextTest, CanServeURLRequest) { // A request for a sandbox mount point should be served. FileSystemURL cracked_url = context->CrackURL(CreateRawFileSystemURL("persistent", "pers_mount")); - EXPECT_EQ(kFileSystemTypePersistent, cracked_url.mount_type()); + EXPECT_EQ(fileapi::kFileSystemTypePersistent, cracked_url.mount_type()); EXPECT_TRUE(context->CanServeURLRequest(cracked_url)); // A request for an isolated mount point should NOT be served. std::string isolated_fs_name = "root"; std::string isolated_fs_id = IsolatedContext::GetInstance()->RegisterFileSystemForPath( - kFileSystemTypeNativeLocal, + fileapi::kFileSystemTypeNativeLocal, base::FilePath(DRIVE FPL("/test/isolated/root")), &isolated_fs_name); cracked_url = context->CrackURL( CreateRawFileSystemURL("isolated", isolated_fs_id)); - EXPECT_EQ(kFileSystemTypeIsolated, cracked_url.mount_type()); + EXPECT_EQ(fileapi::kFileSystemTypeIsolated, cracked_url.mount_type()); EXPECT_FALSE(context->CanServeURLRequest(cracked_url)); // A request for an external mount point should be served. const std::string kExternalMountName = "ext_mount"; ASSERT_TRUE(ExternalMountPoints::GetSystemInstance()->RegisterFileSystem( - kExternalMountName, kFileSystemTypeDrive, FileSystemMountOption(), + kExternalMountName, fileapi::kFileSystemTypeDrive, + FileSystemMountOption(), base::FilePath())); cracked_url = context->CrackURL( CreateRawFileSystemURL("external", kExternalMountName)); - EXPECT_EQ(kFileSystemTypeExternal, cracked_url.mount_type()); + EXPECT_EQ(fileapi::kFileSystemTypeExternal, cracked_url.mount_type()); EXPECT_TRUE(context->CanServeURLRequest(cracked_url)); ExternalMountPoints::GetSystemInstance()->RevokeFileSystem( @@ -371,4 +381,4 @@ TEST_F(FileSystemContextTest, CanServeURLRequest) { } // namespace -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc index f2e0fd1..1468bdf 100644 --- a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc @@ -31,7 +31,11 @@ #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/quota/mock_special_storage_policy.h" -namespace fileapi { +using fileapi::FileSystemContext; +using fileapi::FileSystemOperationContext; +using fileapi::FileSystemURL; + +namespace content { namespace { // We always use the TEMPORARY FileSystem in this test. @@ -54,8 +58,8 @@ class FileSystemDirURLRequestJobTest : public testing::Test { NULL, temp_dir_.path()); file_system_context_->OpenFileSystem( - GURL("http://remote/"), kFileSystemTypeTemporary, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + GURL("http://remote/"), fileapi::kFileSystemTypeTemporary, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&FileSystemDirURLRequestJobTest::OnOpenFileSystem, weak_factory_.GetWeakPtr())); base::RunLoop().RunUntilIdle(); @@ -85,7 +89,7 @@ class FileSystemDirURLRequestJobTest : public testing::Test { delegate_->set_quit_on_redirect(true); request_ = empty_context_.CreateRequest( url, net::DEFAULT_PRIORITY, delegate_.get()); - job_ = new FileSystemDirURLRequestJob( + job_ = new fileapi::FileSystemDirURLRequestJob( request_.get(), NULL, file_system_context); request_->Start(); @@ -206,7 +210,7 @@ class FileSystemDirURLRequestJobTest : public testing::Test { } } - FileSystemFileUtil* file_util() { + fileapi::FileSystemFileUtil* file_util() { return file_system_context_->sandbox_delegate()->sync_file_util(); } @@ -318,4 +322,4 @@ TEST_F(FileSystemDirURLRequestJobTest, Incognito) { } } // namespace (anonymous) -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/file_system_file_stream_reader_unittest.cc b/content/browser/fileapi/file_system_file_stream_reader_unittest.cc index 3540d5b..3295230 100644 --- a/content/browser/fileapi/file_system_file_stream_reader_unittest.cc +++ b/content/browser/fileapi/file_system_file_stream_reader_unittest.cc @@ -21,7 +21,13 @@ #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_file_util.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::FileSystemContext; +using fileapi::FileSystemFileStreamReader; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; + +namespace content { namespace { @@ -30,7 +36,7 @@ const char kTestFileName[] = "test.dat"; const char kTestData[] = "0123456789"; const int kTestDataSize = arraysize(kTestData) - 1; -void ReadFromReader(FileSystemFileStreamReader* reader, +void ReadFromReader(fileapi::FileSystemFileStreamReader* reader, std::string* data, size_t size, int* result) { @@ -69,8 +75,8 @@ class FileSystemFileStreamReaderTest : public testing::Test { NULL, temp_dir_.path()); file_system_context_->OpenFileSystem( - GURL(kURLOrigin), kFileSystemTypeTemporary, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + GURL(kURLOrigin), fileapi::kFileSystemTypeTemporary, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&OnOpenFileSystem)); base::RunLoop().RunUntilIdle(); @@ -83,7 +89,7 @@ class FileSystemFileStreamReaderTest : public testing::Test { } protected: - FileSystemFileStreamReader* CreateFileReader( + fileapi::FileSystemFileStreamReader* CreateFileReader( const std::string& file_name, int64 initial_offset, const base::Time& expected_modification_time) { @@ -125,7 +131,7 @@ class FileSystemFileStreamReaderTest : public testing::Test { FileSystemURL GetFileSystemURL(const std::string& file_name) { return file_system_context_->CreateCrackedFileSystemURL( GURL(kURLOrigin), - kFileSystemTypeTemporary, + fileapi::kFileSystemTypeTemporary, base::FilePath().AppendASCII(file_name)); } @@ -263,4 +269,4 @@ TEST_F(FileSystemFileStreamReaderTest, DeleteWithUnfinishedRead) { reader.reset(); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/file_system_operation_impl_unittest.cc b/content/browser/fileapi/file_system_operation_impl_unittest.cc index ad377d7..b7e92ffb 100644 --- a/content/browser/fileapi/file_system_operation_impl_unittest.cc +++ b/content/browser/fileapi/file_system_operation_impl_unittest.cc @@ -27,11 +27,16 @@ #include "webkit/common/blob/shareable_file_reference.h" #include "webkit/common/fileapi/file_system_util.h" +using fileapi::AsyncFileTestHelper; +using fileapi::FileSystemOperation; +using fileapi::FileSystemOperationContext; +using fileapi::FileSystemOperationRunner; +using fileapi::FileSystemURL; using quota::QuotaManager; using quota::QuotaManagerProxy; using webkit_blob::ShareableFileReference; -namespace fileapi { +namespace content { namespace { @@ -56,7 +61,8 @@ class FileSystemOperationImplTest protected: virtual void SetUp() OVERRIDE { EXPECT_TRUE(base_.CreateUniqueTempDir()); - change_observers_ = MockFileChangeObserver::CreateList(&change_observer_); + change_observers_ = fileapi::MockFileChangeObserver::CreateList( + &change_observer_); base::FilePath base_dir = base_.path().AppendASCII("filesystem"); quota_manager_ = @@ -86,7 +92,7 @@ class FileSystemOperationImplTest int status() const { return status_; } const base::PlatformFileInfo& info() const { return info_; } const base::FilePath& path() const { return path_; } - const std::vector<DirectoryEntry>& entries() const { + const std::vector<fileapi::DirectoryEntry>& entries() const { return entries_; } @@ -103,11 +109,11 @@ class FileSystemOperationImplTest quota_manager_proxy_.get()); } - FileSystemFileUtil* file_util() { + fileapi::FileSystemFileUtil* file_util() { return sandbox_file_system_.file_util(); } - MockFileChangeObserver* change_observer() { + fileapi::MockFileChangeObserver* change_observer() { return &change_observer_; } @@ -191,7 +197,7 @@ class FileSystemOperationImplTest void DidReadDirectory( base::PlatformFileError status, - const std::vector<DirectoryEntry>& entries, + const std::vector<fileapi::DirectoryEntry>& entries, bool /* has_more */) { entries_ = entries; status_ = status; @@ -283,11 +289,11 @@ class FileSystemOperationImplTest int status_; base::PlatformFileInfo info_; base::FilePath path_; - std::vector<DirectoryEntry> entries_; + std::vector<fileapi::DirectoryEntry> entries_; scoped_refptr<ShareableFileReference> shareable_file_ref_; - MockFileChangeObserver change_observer_; - ChangeObserverList change_observers_; + fileapi::MockFileChangeObserver change_observer_; + fileapi::ChangeObserverList change_observers_; base::WeakPtrFactory<FileSystemOperationImplTest> weak_factory_; @@ -1280,4 +1286,4 @@ TEST_F(FileSystemOperationImplTest, EXPECT_EQ(expected_usage, usage); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/file_system_operation_impl_write_unittest.cc b/content/browser/fileapi/file_system_operation_impl_write_unittest.cc index a92288a..e0b9454 100644 --- a/content/browser/fileapi/file_system_operation_impl_write_unittest.cc +++ b/content/browser/fileapi/file_system_operation_impl_write_unittest.cc @@ -30,15 +30,18 @@ #include "webkit/common/blob/blob_data.h" #include "webkit/common/fileapi/file_system_util.h" +using fileapi::FileSystemOperation; +using fileapi::FileSystemOperationRunner; +using fileapi::FileSystemURL; using webkit_blob::MockBlobURLRequestContext; using webkit_blob::ScopedTextBlob; -namespace fileapi { +namespace content { namespace { const GURL kOrigin("http://example.com"); -const FileSystemType kFileSystemType = kFileSystemTypeTest; +const fileapi::FileSystemType kFileSystemType = fileapi::kFileSystemTypeTest; void AssertStatusEq(base::PlatformFileError expected, base::PlatformFileError actual) { @@ -56,7 +59,8 @@ class FileSystemOperationImplWriteTest bytes_written_(0), complete_(false), weak_factory_(this) { - change_observers_ = MockFileChangeObserver::CreateList(&change_observer_); + change_observers_ = fileapi::MockFileChangeObserver::CreateList( + &change_observer_); } virtual void SetUp() { @@ -101,11 +105,11 @@ class FileSystemOperationImplWriteTest bool complete() const { return complete_; } protected: - const ChangeObserverList& change_observers() const { + const fileapi::ChangeObserverList& change_observers() const { return change_observers_; } - MockFileChangeObserver* change_observer() { + fileapi::MockFileChangeObserver* change_observer() { return &change_observer_; } @@ -148,7 +152,7 @@ class FileSystemOperationImplWriteTest return *url_request_context_; } - scoped_refptr<FileSystemContext> file_system_context_; + scoped_refptr<fileapi::FileSystemContext> file_system_context_; scoped_refptr<quota::MockQuotaManager> quota_manager_; base::MessageLoopForIO loop_; @@ -164,8 +168,8 @@ class FileSystemOperationImplWriteTest scoped_ptr<MockBlobURLRequestContext> url_request_context_; - MockFileChangeObserver change_observer_; - ChangeObserverList change_observers_; + fileapi::MockFileChangeObserver change_observer_; + fileapi::ChangeObserverList change_observers_; base::WeakPtrFactory<FileSystemOperationImplWriteTest> weak_factory_; @@ -325,4 +329,4 @@ TEST_F(FileSystemOperationImplWriteTest, TestImmediateCancelFailingWrite) { // TODO(ericu,dmikurube,kinuko): Add more tests for cancel cases. -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/file_system_operation_runner_unittest.cc b/content/browser/fileapi/file_system_operation_runner_unittest.cc index 1fa711b..e2c4b48 100644 --- a/content/browser/fileapi/file_system_operation_runner_unittest.cc +++ b/content/browser/fileapi/file_system_operation_runner_unittest.cc @@ -12,7 +12,12 @@ #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_operation_runner.h" -namespace fileapi { +using fileapi::FileSystemContext; +using fileapi::FileSystemOperationRunner; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; + +namespace content { void GetStatus(bool* done, base::PlatformFileError *status_out, @@ -52,7 +57,7 @@ class FileSystemOperationRunnerTest : public testing::Test { FileSystemURL URL(const std::string& path) { return file_system_context_->CreateCrackedFileSystemURL( - GURL("http://example.com"), kFileSystemTypeTemporary, + GURL("http://example.com"), fileapi::kFileSystemTypeTemporary, base::FilePath::FromUTF8Unsafe(path)); } @@ -159,4 +164,4 @@ TEST_F(FileSystemOperationRunnerTest, CancelWithInvalidId) { ASSERT_EQ(base::PLATFORM_FILE_ERROR_INVALID_OPERATION, cancel_status); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/file_system_quota_client_unittest.cc b/content/browser/fileapi/file_system_quota_client_unittest.cc index c4baa4f..20e2b5f 100644 --- a/content/browser/fileapi/file_system_quota_client_unittest.cc +++ b/content/browser/fileapi/file_system_quota_client_unittest.cc @@ -21,7 +21,12 @@ #include "webkit/common/fileapi/file_system_util.h" #include "webkit/common/quota/quota_types.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::FileSystemQuotaClient; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; + +namespace content { namespace { const char kDummyURL1[] = "http://www.dummy.org"; @@ -78,8 +83,9 @@ class FileSystemQuotaClientTest : public testing::Test { return usage_; } - const std::set<GURL>& GetOriginsForType(FileSystemQuotaClient* quota_client, - quota::StorageType type) { + const std::set<GURL>& GetOriginsForType( + FileSystemQuotaClient* quota_client, + quota::StorageType type) { origins_.clear(); quota_client->GetOriginsForType( type, @@ -89,9 +95,10 @@ class FileSystemQuotaClientTest : public testing::Test { return origins_; } - const std::set<GURL>& GetOriginsForHost(FileSystemQuotaClient* quota_client, - quota::StorageType type, - const std::string& host) { + const std::set<GURL>& GetOriginsForHost( + FileSystemQuotaClient* quota_client, + quota::StorageType type, + const std::string& host) { origins_.clear(); quota_client->GetOriginsForHost( type, host, @@ -101,9 +108,10 @@ class FileSystemQuotaClientTest : public testing::Test { return origins_; } - void RunAdditionalOriginUsageTask(FileSystemQuotaClient* quota_client, - const std::string& origin_url, - quota::StorageType type) { + void RunAdditionalOriginUsageTask( + FileSystemQuotaClient* quota_client, + const std::string& origin_url, + quota::StorageType type) { quota_client->GetOriginUsage( GURL(origin_url), type, base::Bind(&FileSystemQuotaClientTest::OnGetAdditionalUsage, @@ -113,7 +121,8 @@ class FileSystemQuotaClientTest : public testing::Test { bool CreateFileSystemDirectory(const base::FilePath& file_path, const std::string& origin_url, quota::StorageType storage_type) { - FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type); + FileSystemType type = fileapi::QuotaStorageTypeToFileSystemType( + storage_type); FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( GURL(origin_url), type, file_path); @@ -129,7 +138,8 @@ class FileSystemQuotaClientTest : public testing::Test { if (file_path.empty()) return false; - FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type); + FileSystemType type = fileapi::QuotaStorageTypeToFileSystemType( + storage_type); FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( GURL(origin_url), type, file_path); @@ -181,7 +191,8 @@ class FileSystemQuotaClientTest : public testing::Test { GURL(files[i].origin_url) == GURL(origin_url)) { base::FilePath path = base::FilePath().AppendASCII(files[i].name); if (!path.empty()) { - file_paths_cost += ObfuscatedFileUtil::ComputeFilePathCost(path); + file_paths_cost += fileapi::ObfuscatedFileUtil::ComputeFilePathCost( + path); } } } @@ -224,7 +235,7 @@ class FileSystemQuotaClientTest : public testing::Test { base::ScopedTempDir data_dir_; base::MessageLoop message_loop_; - scoped_refptr<FileSystemContext> file_system_context_; + scoped_refptr<fileapi::FileSystemContext> file_system_context_; base::WeakPtrFactory<FileSystemQuotaClientTest> weak_factory_; int64 usage_; int additional_callback_count_; @@ -558,4 +569,4 @@ TEST_F(FileSystemQuotaClientTest, DeleteOriginTest) { kTemporary)); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/file_system_url_request_job_unittest.cc b/content/browser/fileapi/file_system_url_request_job_unittest.cc index 7edd26a..e4fbc15 100644 --- a/content/browser/fileapi/file_system_url_request_job_unittest.cc +++ b/content/browser/fileapi/file_system_url_request_job_unittest.cc @@ -37,7 +37,12 @@ #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_file_util.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::FileSystemContext; +using fileapi::FileSystemURL; +using fileapi::FileSystemURLRequestJob; + +namespace content { namespace { // We always use the TEMPORARY FileSystem in this test. @@ -64,8 +69,8 @@ class FileSystemURLRequestJobTest : public testing::Test { CreateFileSystemContextForTesting(NULL, temp_dir_.path()); file_system_context_->OpenFileSystem( - GURL("http://remote/"), kFileSystemTypeTemporary, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + GURL("http://remote/"), fileapi::kFileSystemTypeTemporary, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&FileSystemURLRequestJobTest::OnOpenFileSystem, weak_factory_.GetWeakPtr())); base::RunLoop().RunUntilIdle(); @@ -135,7 +140,7 @@ class FileSystemURLRequestJobTest : public testing::Test { void CreateDirectory(const base::StringPiece& dir_name) { FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( GURL("http://remote"), - kFileSystemTypeTemporary, + fileapi::kFileSystemTypeTemporary, base::FilePath().AppendASCII(dir_name)); ASSERT_EQ(base::PLATFORM_FILE_OK, AsyncFileTestHelper::CreateDirectory( file_system_context_, url)); @@ -145,7 +150,7 @@ class FileSystemURLRequestJobTest : public testing::Test { const char* buf, int buf_size) { FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( GURL("http://remote"), - kFileSystemTypeTemporary, + fileapi::kFileSystemTypeTemporary, base::FilePath().AppendASCII(file_name)); ASSERT_EQ(base::PLATFORM_FILE_OK, AsyncFileTestHelper::CreateFileWithData( @@ -177,7 +182,7 @@ class FileSystemURLRequestJobTest : public testing::Test { base::MessageLoopForIO message_loop_; base::ScopedTempDir temp_dir_; - scoped_refptr<FileSystemContext> file_system_context_; + scoped_refptr<fileapi::FileSystemContext> file_system_context_; base::WeakPtrFactory<FileSystemURLRequestJobTest> weak_factory_; net::URLRequestContext empty_context_; @@ -365,4 +370,4 @@ TEST_F(FileSystemURLRequestJobTest, Incognito) { } } // namespace -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/file_writer_delegate_unittest.cc b/content/browser/fileapi/file_writer_delegate_unittest.cc index 39ed9d7..08e720f 100644 --- a/content/browser/fileapi/file_writer_delegate_unittest.cc +++ b/content/browser/fileapi/file_writer_delegate_unittest.cc @@ -26,12 +26,16 @@ #include "webkit/browser/fileapi/file_writer_delegate.h" #include "webkit/browser/fileapi/sandbox_file_stream_writer.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::FileSystemURL; +using fileapi::FileWriterDelegate; + +namespace content { namespace { const GURL kOrigin("http://example.com"); -const FileSystemType kFileSystemType = kFileSystemTypeTest; +const fileapi::FileSystemType kFileSystemType = fileapi::kFileSystemTypeTest; const char kData[] = "The quick brown fox jumps over the lazy dog.\n"; const int kDataSize = ARRAYSIZE_UNSAFE(kData) - 1; @@ -109,13 +113,15 @@ class FileWriterDelegateTest : public PlatformTest { const char* test_file_path, int64 offset, int64 allowed_growth) { - SandboxFileStreamWriter* writer = new SandboxFileStreamWriter( - file_system_context_.get(), - GetFileSystemURL(test_file_path), - offset, - *file_system_context_->GetUpdateObservers(kFileSystemType)); + fileapi::SandboxFileStreamWriter* writer = + new fileapi::SandboxFileStreamWriter( + file_system_context_.get(), + GetFileSystemURL(test_file_path), + offset, + *file_system_context_->GetUpdateObservers(kFileSystemType)); writer->set_default_quota(allowed_growth); - return new FileWriterDelegate(scoped_ptr<FileStreamWriter>(writer)); + return new FileWriterDelegate( + scoped_ptr<fileapi::FileStreamWriter>(writer)); } FileWriterDelegate::DelegateWriteCallback GetWriteCallback(Result* result) { @@ -139,7 +145,7 @@ class FileWriterDelegateTest : public PlatformTest { // This should be alive until the very end of this instance. base::MessageLoopForIO loop_; - scoped_refptr<FileSystemContext> file_system_context_; + scoped_refptr<fileapi::FileSystemContext> file_system_context_; net::URLRequestContext empty_context_; scoped_ptr<FileWriterDelegate> file_writer_delegate_; @@ -452,4 +458,4 @@ TEST_F(FileWriterDelegateTest, WritesWithQuotaAndOffset) { } } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/fileapi_message_filter_unittest.cc b/content/browser/fileapi/fileapi_message_filter_unittest.cc index 3dbdcc3d..a572386 100644 --- a/content/browser/fileapi/fileapi_message_filter_unittest.cc +++ b/content/browser/fileapi/fileapi_message_filter_unittest.cc @@ -50,7 +50,7 @@ class FileAPIMessageFilterTest : public testing::Test { protected: virtual void SetUp() OVERRIDE { file_system_context_ = - fileapi::CreateFileSystemContextForTesting(NULL, base::FilePath()); + CreateFileSystemContextForTesting(NULL, base::FilePath()); std::vector<fileapi::FileSystemType> types; file_system_context_->GetFileSystemTypes(&types); diff --git a/content/browser/fileapi/local_file_util_unittest.cc b/content/browser/fileapi/local_file_util_unittest.cc index 5e83144..dfde5a5 100644 --- a/content/browser/fileapi/local_file_util_unittest.cc +++ b/content/browser/fileapi/local_file_util_unittest.cc @@ -23,12 +23,20 @@ #include "webkit/browser/fileapi/native_file_util.h" #include "webkit/common/fileapi/file_system_types.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::AsyncFileUtilAdapter; +using fileapi::FileSystemContext; +using fileapi::FileSystemOperationContext; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; +using fileapi::LocalFileUtil; + +namespace content { namespace { const GURL kOrigin("http://foo/"); -const FileSystemType kFileSystemType = kFileSystemTypeTest; +const FileSystemType kFileSystemType = fileapi::kFileSystemTypeTest; } // namespace @@ -385,4 +393,4 @@ TEST_F(LocalFileUtilTest, MoveDirectory) { EXPECT_EQ(1020, GetSize(to_file)); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/obfuscated_file_util_unittest.cc b/content/browser/fileapi/obfuscated_file_util_unittest.cc index 72dd360..58f99d9 100644 --- a/content/browser/fileapi/obfuscated_file_util_unittest.cc +++ b/content/browser/fileapi/obfuscated_file_util_unittest.cc @@ -34,7 +34,19 @@ #include "webkit/common/database/database_identifier.h" #include "webkit/common/quota/quota_types.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::FileSystemContext; +using fileapi::FileSystemOperation; +using fileapi::FileSystemOperationContext; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; +using fileapi::ObfuscatedFileUtil; +using fileapi::SandboxDirectoryDatabase; +using fileapi::SandboxIsolatedOriginDatabase; +using fileapi::kFileSystemTypeTemporary; +using fileapi::kFileSystemTypePersistent; + +namespace content { namespace { @@ -110,11 +122,12 @@ FileSystemURL FileSystemURLAppendUTF8( FileSystemURL FileSystemURLDirName(const FileSystemURL& url) { return FileSystemURL::CreateForTest( - url.origin(), url.mount_type(), VirtualPath::DirName(url.virtual_path())); + url.origin(), url.mount_type(), + fileapi::VirtualPath::DirName(url.virtual_path())); } std::string GetTypeString(FileSystemType type) { - return SandboxFileSystemBackendDelegate::GetTypeString(type); + return fileapi::SandboxFileSystemBackendDelegate::GetTypeString(type); } bool HasFileSystemType( @@ -133,7 +146,7 @@ class ObfuscatedFileUtilTest : public testing::Test { public: ObfuscatedFileUtilTest() : origin_(GURL("http://www.example.com")), - type_(kFileSystemTypeTemporary), + type_(fileapi::kFileSystemTypeTemporary), weak_factory_(this), sandbox_file_system_(origin_, type_), quota_status_(quota::kQuotaStatusUnknown), @@ -162,7 +175,8 @@ class ObfuscatedFileUtilTest : public testing::Test { sandbox_file_system_.SetUp(file_system_context_.get()); - change_observers_ = MockFileChangeObserver::CreateList(&change_observer_); + change_observers_ = fileapi::MockFileChangeObserver::CreateList( + &change_observer_); } virtual void TearDown() { @@ -196,11 +210,11 @@ class ObfuscatedFileUtilTest : public testing::Test { return context; } - const ChangeObserverList& change_observers() const { + const fileapi::ChangeObserverList& change_observers() const { return change_observers_; } - MockFileChangeObserver* change_observer() { + fileapi::MockFileChangeObserver* change_observer() { return &change_observer_; } @@ -217,6 +231,14 @@ class ObfuscatedFileUtilTest : public testing::Test { return file_system; } + scoped_ptr<ObfuscatedFileUtil> CreateObfuscatedFileUtil( + quota::SpecialStoragePolicy* storage_policy) { + return scoped_ptr<ObfuscatedFileUtil>( + ObfuscatedFileUtil::CreateForTesting( + storage_policy, data_dir_path(), + base::MessageLoopProxy::current().get())); + } + ObfuscatedFileUtil* ofu() { return static_cast<ObfuscatedFileUtil*>(sandbox_file_system_.file_util()); } @@ -283,7 +305,7 @@ class ObfuscatedFileUtilTest : public testing::Test { } int64 usage() const { return usage_; } - FileSystemUsageCache* usage_cache() { + fileapi::FileSystemUsageCache* usage_cache() { return sandbox_file_system_.usage_cache(); } @@ -427,7 +449,7 @@ class ObfuscatedFileUtilTest : public testing::Test { std::set<base::FilePath::StringType>* files, std::set<base::FilePath::StringType>* directories) { scoped_ptr<FileSystemOperationContext> context; - std::vector<DirectoryEntry> entries; + std::vector<fileapi::DirectoryEntry> entries; EXPECT_EQ(base::PLATFORM_FILE_OK, AsyncFileTestHelper::ReadDirectory( file_system_context(), root_url, &entries)); @@ -471,17 +493,17 @@ class ObfuscatedFileUtilTest : public testing::Test { FillTestDirectory(root_url, &files, &directories); scoped_ptr<FileSystemOperationContext> context; - std::vector<DirectoryEntry> entries; + std::vector<fileapi::DirectoryEntry> entries; context.reset(NewContext(NULL)); EXPECT_EQ(base::PLATFORM_FILE_OK, AsyncFileTestHelper::ReadDirectory( file_system_context(), root_url, &entries)); - std::vector<DirectoryEntry>::iterator entry_iter; + std::vector<fileapi::DirectoryEntry>::iterator entry_iter; EXPECT_EQ(files.size() + directories.size(), entries.size()); EXPECT_TRUE(change_observer()->HasNoChange()); for (entry_iter = entries.begin(); entry_iter != entries.end(); ++entry_iter) { - const DirectoryEntry& entry = *entry_iter; + const fileapi::DirectoryEntry& entry = *entry_iter; std::set<base::FilePath::StringType>::iterator iter = files.find(entry.name); if (iter != files.end()) { @@ -662,6 +684,120 @@ class ObfuscatedFileUtilTest : public testing::Test { EXPECT_NE(base::Time(), GetModifiedTime(dest_dir_url)); } + void MaybeDropDatabasesAliveCaseTestBody() { + scoped_ptr<ObfuscatedFileUtil> file_util = CreateObfuscatedFileUtil(NULL); + file_util->InitOriginDatabase(GURL(), true /*create*/); + ASSERT_TRUE(file_util->origin_database_ != NULL); + + // Callback to Drop DB is called while ObfuscatedFileUtilTest is + // still alive. + file_util->db_flush_delay_seconds_ = 0; + file_util->MarkUsed(); + base::RunLoop().RunUntilIdle(); + + ASSERT_TRUE(file_util->origin_database_ == NULL); + } + + void MaybeDropDatabasesAlreadyDeletedCaseTestBody() { + // Run message loop after OFU is already deleted to make sure callback + // doesn't cause a crash for use after free. + { + scoped_ptr<ObfuscatedFileUtil> file_util = CreateObfuscatedFileUtil(NULL); + file_util->InitOriginDatabase(GURL(), true /*create*/); + file_util->db_flush_delay_seconds_ = 0; + file_util->MarkUsed(); + } + + // At this point the callback is still in the message queue but OFU is gone. + base::RunLoop().RunUntilIdle(); + } + + void DestroyDirectoryDatabase_IsolatedTestBody() { + storage_policy_->AddIsolated(origin_); + scoped_ptr<ObfuscatedFileUtil> file_util = CreateObfuscatedFileUtil( + storage_policy_.get()); + const FileSystemURL url = FileSystemURL::CreateForTest( + origin_, kFileSystemTypePersistent, base::FilePath()); + + // Create DirectoryDatabase for isolated origin. + SandboxDirectoryDatabase* db = + file_util->GetDirectoryDatabase(url, true /* create */); + ASSERT_TRUE(db != NULL); + + // Destory it. + ASSERT_TRUE(file_util->DestroyDirectoryDatabase( + url.origin(), GetTypeString(url.type()))); + ASSERT_TRUE(file_util->directories_.empty()); + } + + void GetDirectoryDatabase_IsolatedTestBody() { + storage_policy_->AddIsolated(origin_); + scoped_ptr<ObfuscatedFileUtil> file_util = CreateObfuscatedFileUtil( + storage_policy_.get()); + const FileSystemURL url = FileSystemURL::CreateForTest( + origin_, kFileSystemTypePersistent, base::FilePath()); + + // Create DirectoryDatabase for isolated origin. + SandboxDirectoryDatabase* db = + file_util->GetDirectoryDatabase(url, true /* create */); + ASSERT_TRUE(db != NULL); + ASSERT_EQ(1U, file_util->directories_.size()); + + // Remove isolated. + storage_policy_->RemoveIsolated(url.origin()); + + // This should still get the same database. + SandboxDirectoryDatabase* db2 = + file_util->GetDirectoryDatabase(url, false /* create */); + ASSERT_EQ(db, db2); + } + + void MigrationBackFromIsolatedTestBody() { + std::string kFakeDirectoryData("0123456789"); + base::FilePath old_directory_db_path; + + // Initialize the directory with one origin using + // SandboxIsolatedOriginDatabase. + { + std::string origin_string = + webkit_database::GetIdentifierFromOrigin(origin_); + SandboxIsolatedOriginDatabase database_old( + origin_string, data_dir_path(), + base::FilePath( + SandboxIsolatedOriginDatabase::kObsoleteOriginDirectory)); + base::FilePath path; + EXPECT_TRUE(database_old.GetPathForOrigin(origin_string, &path)); + EXPECT_FALSE(path.empty()); + + // Populate the origin directory with some fake data. + old_directory_db_path = data_dir_path().Append(path); + ASSERT_TRUE(base::CreateDirectory(old_directory_db_path)); + EXPECT_EQ(static_cast<int>(kFakeDirectoryData.size()), + file_util::WriteFile(old_directory_db_path.AppendASCII("dummy"), + kFakeDirectoryData.data(), + kFakeDirectoryData.size())); + } + + storage_policy_->AddIsolated(origin_); + scoped_ptr<ObfuscatedFileUtil> file_util = CreateObfuscatedFileUtil( + storage_policy_.get()); + base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED; + base::FilePath origin_directory = file_util->GetDirectoryForOrigin( + origin_, true /* create */, &error); + EXPECT_EQ(base::PLATFORM_FILE_OK, error); + + // The database is migrated from the old one. + EXPECT_TRUE(base::DirectoryExists(origin_directory)); + EXPECT_FALSE(base::DirectoryExists(old_directory_db_path)); + + // Check we see the same contents in the new origin directory. + std::string origin_db_data; + EXPECT_TRUE(base::PathExists(origin_directory.AppendASCII("dummy"))); + EXPECT_TRUE(base::ReadFileToString( + origin_directory.AppendASCII("dummy"), &origin_db_data)); + EXPECT_EQ(kFakeDirectoryData, origin_db_data); + } + int64 ComputeCurrentUsage() { return sandbox_file_system_.ComputeCurrentOriginUsage() - sandbox_file_system_.ComputeCurrentDirectoryDatabaseUsage(); @@ -687,8 +823,8 @@ class ObfuscatedFileUtilTest : public testing::Test { SandboxFileSystemTestHelper sandbox_file_system_; quota::QuotaStatusCode quota_status_; int64 usage_; - MockFileChangeObserver change_observer_; - ChangeObserverList change_observers_; + fileapi::MockFileChangeObserver change_observer_; + fileapi::ChangeObserverList change_observers_; private: DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileUtilTest); @@ -1120,7 +1256,7 @@ TEST_F(ObfuscatedFileUtilTest, TestReadDirectoryOnFile) { ofu()->EnsureFileExists(context.get(), url, &created)); ASSERT_TRUE(created); - std::vector<DirectoryEntry> entries; + std::vector<fileapi::DirectoryEntry> entries; EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY, AsyncFileTestHelper::ReadDirectory( file_system_context(), url, &entries)); @@ -1567,9 +1703,10 @@ TEST_F(ObfuscatedFileUtilTest, TestRevokeUsageCache) { int64 expected_quota = 0; - for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) { + for (size_t i = 0; i < fileapi::test::kRegularTestCaseSize; ++i) { SCOPED_TRACE(testing::Message() << "Creating kRegularTestCase " << i); - const test::TestCaseRecord& test_case = test::kRegularTestCases[i]; + const fileapi::test::TestCaseRecord& test_case = + fileapi::test::kRegularTestCases[i]; base::FilePath file_path(test_case.path); expected_quota += ObfuscatedFileUtil::ComputeFilePathCost(file_path); if (test_case.is_directory) { @@ -1702,7 +1839,7 @@ TEST_F(ObfuscatedFileUtilTest, TestIncompleteDirectoryReading) { EXPECT_TRUE(created); } - std::vector<DirectoryEntry> entries; + std::vector<fileapi::DirectoryEntry> entries; EXPECT_EQ(base::PLATFORM_FILE_OK, AsyncFileTestHelper::ReadDirectory( file_system_context(), empty_path, &entries)); @@ -1959,7 +2096,7 @@ TEST_F(ObfuscatedFileUtilTest, TestFileEnumeratorTimestamp) { base::Time())); context.reset(NewContext(NULL)); - scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> file_enum( + scoped_ptr<fileapi::FileSystemFileUtil::AbstractFileEnumerator> file_enum( ofu()->CreateFileEnumerator(context.get(), dir, false)); int count = 0; @@ -2312,128 +2449,23 @@ TEST_F(ObfuscatedFileUtilTest, TestQuotaOnOpen) { } TEST_F(ObfuscatedFileUtilTest, MaybeDropDatabasesAliveCase) { - scoped_ptr<ObfuscatedFileUtil> file_util( - ObfuscatedFileUtil::CreateForTesting( - NULL, data_dir_path(), - base::MessageLoopProxy::current().get())); - file_util->InitOriginDatabase(GURL(), true /*create*/); - ASSERT_TRUE(file_util->origin_database_ != NULL); - - // Callback to Drop DB is called while ObfuscatedFileUtilTest is still alive. - file_util->db_flush_delay_seconds_ = 0; - file_util->MarkUsed(); - base::RunLoop().RunUntilIdle(); - - ASSERT_TRUE(file_util->origin_database_ == NULL); + MaybeDropDatabasesAliveCaseTestBody(); } TEST_F(ObfuscatedFileUtilTest, MaybeDropDatabasesAlreadyDeletedCase) { - // Run message loop after OFU is already deleted to make sure callback doesn't - // cause a crash for use after free. - { - scoped_ptr<ObfuscatedFileUtil> file_util( - ObfuscatedFileUtil::CreateForTesting( - NULL, data_dir_path(), - base::MessageLoopProxy::current().get())); - file_util->InitOriginDatabase(GURL(), true /*create*/); - file_util->db_flush_delay_seconds_ = 0; - file_util->MarkUsed(); - } - - // At this point the callback is still in the message queue but OFU is gone. - base::RunLoop().RunUntilIdle(); + MaybeDropDatabasesAlreadyDeletedCaseTestBody(); } TEST_F(ObfuscatedFileUtilTest, DestroyDirectoryDatabase_Isolated) { - storage_policy_->AddIsolated(origin_); - scoped_ptr<ObfuscatedFileUtil> file_util( - ObfuscatedFileUtil::CreateForTesting( - storage_policy_.get(), data_dir_path(), - base::MessageLoopProxy::current().get())); - const FileSystemURL url = FileSystemURL::CreateForTest( - origin_, kFileSystemTypePersistent, base::FilePath()); - - // Create DirectoryDatabase for isolated origin. - SandboxDirectoryDatabase* db = - file_util->GetDirectoryDatabase(url, true /* create */); - ASSERT_TRUE(db != NULL); - - // Destory it. - ASSERT_TRUE(file_util->DestroyDirectoryDatabase( - url.origin(), GetTypeString(url.type()))); - ASSERT_TRUE(file_util->directories_.empty()); + DestroyDirectoryDatabase_IsolatedTestBody(); } TEST_F(ObfuscatedFileUtilTest, GetDirectoryDatabase_Isolated) { - storage_policy_->AddIsolated(origin_); - scoped_ptr<ObfuscatedFileUtil> file_util( - ObfuscatedFileUtil::CreateForTesting( - storage_policy_.get(), data_dir_path(), - base::MessageLoopProxy::current().get())); - const FileSystemURL url = FileSystemURL::CreateForTest( - origin_, kFileSystemTypePersistent, base::FilePath()); - - // Create DirectoryDatabase for isolated origin. - SandboxDirectoryDatabase* db = - file_util->GetDirectoryDatabase(url, true /* create */); - ASSERT_TRUE(db != NULL); - ASSERT_EQ(1U, file_util->directories_.size()); - - // Remove isolated. - storage_policy_->RemoveIsolated(url.origin()); - - // This should still get the same database. - SandboxDirectoryDatabase* db2 = - file_util->GetDirectoryDatabase(url, false /* create */); - ASSERT_EQ(db, db2); + GetDirectoryDatabase_IsolatedTestBody(); } TEST_F(ObfuscatedFileUtilTest, MigrationBackFromIsolated) { - std::string kFakeDirectoryData("0123456789"); - base::FilePath old_directory_db_path; - - // Initialize the directory with one origin using - // SandboxIsolatedOriginDatabase. - { - std::string origin_string = - webkit_database::GetIdentifierFromOrigin(origin_); - SandboxIsolatedOriginDatabase database_old( - origin_string, data_dir_path(), - base::FilePath( - SandboxIsolatedOriginDatabase::kObsoleteOriginDirectory)); - base::FilePath path; - EXPECT_TRUE(database_old.GetPathForOrigin(origin_string, &path)); - EXPECT_FALSE(path.empty()); - - // Populate the origin directory with some fake data. - old_directory_db_path = data_dir_path().Append(path); - ASSERT_TRUE(base::CreateDirectory(old_directory_db_path)); - EXPECT_EQ(static_cast<int>(kFakeDirectoryData.size()), - file_util::WriteFile(old_directory_db_path.AppendASCII("dummy"), - kFakeDirectoryData.data(), - kFakeDirectoryData.size())); - } - - storage_policy_->AddIsolated(origin_); - scoped_ptr<ObfuscatedFileUtil> file_util( - ObfuscatedFileUtil::CreateForTesting( - storage_policy_.get(), data_dir_path(), - base::MessageLoopProxy::current().get())); - base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED; - base::FilePath origin_directory = file_util->GetDirectoryForOrigin( - origin_, true /* create */, &error); - EXPECT_EQ(base::PLATFORM_FILE_OK, error); - - // The database is migrated from the old one. - EXPECT_TRUE(base::DirectoryExists(origin_directory)); - EXPECT_FALSE(base::DirectoryExists(old_directory_db_path)); - - // Check we see the same contents in the new origin directory. - std::string origin_db_data; - EXPECT_TRUE(base::PathExists(origin_directory.AppendASCII("dummy"))); - EXPECT_TRUE(base::ReadFileToString( - origin_directory.AppendASCII("dummy"), &origin_db_data)); - EXPECT_EQ(kFakeDirectoryData, origin_db_data); + MigrationBackFromIsolatedTestBody(); } TEST_F(ObfuscatedFileUtilTest, OpenPathInNonDirectory) { @@ -2487,4 +2519,4 @@ TEST_F(ObfuscatedFileUtilTest, CreateDirectory_NotADirectoryInRecursive) { true /* recursive */)); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc b/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc index 0cc2f48..efd0a77 100644 --- a/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc +++ b/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc @@ -19,14 +19,19 @@ #include "webkit/browser/fileapi/plugin_private_file_system_backend.h" #include "webkit/common/fileapi/file_system_util.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::FileSystemContext; +using fileapi::FileSystemURL; +using fileapi::IsolatedContext; + +namespace content { namespace { const GURL kOrigin("http://www.example.com"); const std::string kPlugin1("plugin1"); const std::string kPlugin2("plugin2"); -const FileSystemType kType = kFileSystemTypePluginPrivate; +const fileapi::FileSystemType kType = fileapi::kFileSystemTypePluginPrivate; const std::string kRootName = "pluginprivate"; void DidOpenFileSystem(base::PlatformFileError* error_out, @@ -58,7 +63,7 @@ class PluginPrivateFileSystemBackendTest : public testing::Test { root.virtual_path().AppendASCII(relative)); } - PluginPrivateFileSystemBackend* backend() const { + fileapi::PluginPrivateFileSystemBackend* backend() const { return context_->plugin_private_backend(); } @@ -75,7 +80,7 @@ TEST_F(PluginPrivateFileSystemBackendTest, OpenFileSystemBasic) { base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED; backend()->OpenPrivateFileSystem( kOrigin, kType, filesystem_id1, kPlugin1, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&DidOpenFileSystem, &error)); base::RunLoop().RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, error); @@ -85,13 +90,14 @@ TEST_F(PluginPrivateFileSystemBackendTest, OpenFileSystemBasic) { error = base::PLATFORM_FILE_ERROR_FAILED; backend()->OpenPrivateFileSystem( kOrigin, kType, filesystem_id2, kPlugin1, - OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT, base::Bind(&DidOpenFileSystem, &error)); base::RunLoop().RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, error); const GURL root_url( - GetIsolatedFileSystemRootURIString(kOrigin, filesystem_id1, kRootName)); + fileapi::GetIsolatedFileSystemRootURIString( + kOrigin, filesystem_id1, kRootName)); FileSystemURL file = CreateURL(root_url, "foo"); base::FilePath platform_path; EXPECT_EQ(base::PLATFORM_FILE_OK, @@ -109,7 +115,7 @@ TEST_F(PluginPrivateFileSystemBackendTest, PluginIsolation) { base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED; backend()->OpenPrivateFileSystem( kOrigin, kType, filesystem_id1, kPlugin1, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&DidOpenFileSystem, &error)); base::RunLoop().RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, error); @@ -118,14 +124,15 @@ TEST_F(PluginPrivateFileSystemBackendTest, PluginIsolation) { error = base::PLATFORM_FILE_ERROR_FAILED; backend()->OpenPrivateFileSystem( kOrigin, kType, filesystem_id2, kPlugin2, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&DidOpenFileSystem, &error)); base::RunLoop().RunUntilIdle(); ASSERT_EQ(base::PLATFORM_FILE_OK, error); // Create 'foo' in kPlugin1. const GURL root_url1( - GetIsolatedFileSystemRootURIString(kOrigin, filesystem_id1, kRootName)); + fileapi::GetIsolatedFileSystemRootURIString( + kOrigin, filesystem_id1, kRootName)); FileSystemURL file1 = CreateURL(root_url1, "foo"); base::FilePath platform_path; EXPECT_EQ(base::PLATFORM_FILE_OK, @@ -135,7 +142,8 @@ TEST_F(PluginPrivateFileSystemBackendTest, PluginIsolation) { // See the same path is not available in kPlugin2. const GURL root_url2( - GetIsolatedFileSystemRootURIString(kOrigin, filesystem_id2, kRootName)); + fileapi::GetIsolatedFileSystemRootURIString( + kOrigin, filesystem_id2, kRootName)); FileSystemURL file2 = CreateURL(root_url2, "foo"); EXPECT_FALSE(AsyncFileTestHelper::FileExists( context_.get(), file2, AsyncFileTestHelper::kDontCheckSize)); @@ -144,4 +152,4 @@ TEST_F(PluginPrivateFileSystemBackendTest, PluginIsolation) { // TODO(kinuko,nhiroki): also test if DeleteOriginDataOnFileThread // works fine when there's multiple plugin partitions. -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/recursive_operation_delegate_unittest.cc b/content/browser/fileapi/recursive_operation_delegate_unittest.cc index d3671fe..397041f 100644 --- a/content/browser/fileapi/recursive_operation_delegate_unittest.cc +++ b/content/browser/fileapi/recursive_operation_delegate_unittest.cc @@ -19,10 +19,14 @@ #include "webkit/browser/fileapi/file_system_operation.h" #include "webkit/browser/fileapi/file_system_operation_runner.h" -namespace fileapi { +using fileapi::FileSystemContext; +using fileapi::FileSystemOperationContext; +using fileapi::FileSystemURL; + +namespace content { namespace { -class LoggingRecursiveOperation : public RecursiveOperationDelegate { +class LoggingRecursiveOperation : public fileapi::RecursiveOperationDelegate { public: struct LogEntry { enum Type { @@ -37,7 +41,7 @@ class LoggingRecursiveOperation : public RecursiveOperationDelegate { LoggingRecursiveOperation(FileSystemContext* file_system_context, const FileSystemURL& root, const StatusCallback& callback) - : RecursiveOperationDelegate(file_system_context), + : fileapi::RecursiveOperationDelegate(file_system_context), root_(root), callback_(callback), weak_factory_(this) { @@ -113,7 +117,8 @@ void ReportStatus(base::PlatformFileError* out_error, // To test the Cancel() during operation, calls Cancel() of |operation| // after |counter| times message posting. -void CallCancelLater(RecursiveOperationDelegate* operation, int counter) { +void CallCancelLater(fileapi::RecursiveOperationDelegate* operation, + int counter) { if (counter > 0) { base::MessageLoopProxy::current()->PostTask( FROM_HERE, @@ -145,7 +150,7 @@ class RecursiveOperationDelegateTest : public testing::Test { return make_scoped_ptr(context); } - FileSystemFileUtil* file_util() { + fileapi::FileSystemFileUtil* file_util() { return sandbox_file_system_.file_util(); } @@ -277,4 +282,4 @@ TEST_F(RecursiveOperationDelegateTest, Cancel) { ASSERT_EQ(base::PLATFORM_FILE_ERROR_ABORT, error); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc b/content/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc index c87043b..935f6ce 100644 --- a/content/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc +++ b/content/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc @@ -15,14 +15,17 @@ #include "url/gurl.h" #include "webkit/browser/fileapi/file_system_url.h" -namespace fileapi { +using fileapi::FileSystemURL; + +namespace content { namespace { FileSystemURL CreateFileSystemURL(const char* path) { const GURL kOrigin("http://foo/"); - return FileSystemURL::CreateForTest( - kOrigin, kFileSystemTypeTemporary, base::FilePath::FromUTF8Unsafe(path)); + return fileapi::FileSystemURL::CreateForTest( + kOrigin, fileapi::kFileSystemTypeTemporary, + base::FilePath::FromUTF8Unsafe(path)); } } // namespace @@ -31,7 +34,7 @@ class SandboxFileSystemBackendDelegateTest : public testing::Test { protected: virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); - delegate_.reset(new SandboxFileSystemBackendDelegate( + delegate_.reset(new fileapi::SandboxFileSystemBackendDelegate( NULL /* quota_manager_proxy */, base::MessageLoopProxy::current().get(), data_dir_.path(), @@ -39,44 +42,48 @@ class SandboxFileSystemBackendDelegateTest : public testing::Test { CreateAllowFileAccessOptions())); } + bool IsAccessValid(const FileSystemURL& url) const { + return delegate_->IsAccessValid(url); + } + base::ScopedTempDir data_dir_; base::MessageLoop message_loop_; - scoped_ptr<SandboxFileSystemBackendDelegate> delegate_; + scoped_ptr<fileapi::SandboxFileSystemBackendDelegate> delegate_; }; TEST_F(SandboxFileSystemBackendDelegateTest, IsAccessValid) { // Normal case. - EXPECT_TRUE(delegate_->IsAccessValid(CreateFileSystemURL("a"))); + EXPECT_TRUE(IsAccessValid(CreateFileSystemURL("a"))); // Access to a path with parent references ('..') should be disallowed. - EXPECT_FALSE(delegate_->IsAccessValid(CreateFileSystemURL("a/../b"))); + EXPECT_FALSE(IsAccessValid(CreateFileSystemURL("a/../b"))); // Access from non-allowed scheme should be disallowed. - EXPECT_FALSE(delegate_->IsAccessValid( + EXPECT_FALSE(IsAccessValid( FileSystemURL::CreateForTest( - GURL("unknown://bar"), kFileSystemTypeTemporary, + GURL("unknown://bar"), fileapi::kFileSystemTypeTemporary, base::FilePath::FromUTF8Unsafe("foo")))); // Access with restricted name should be disallowed. - EXPECT_FALSE(delegate_->IsAccessValid(CreateFileSystemURL("."))); - EXPECT_FALSE(delegate_->IsAccessValid(CreateFileSystemURL(".."))); + EXPECT_FALSE(IsAccessValid(CreateFileSystemURL("."))); + EXPECT_FALSE(IsAccessValid(CreateFileSystemURL(".."))); // This is also disallowed due to Windows XP parent path handling. - EXPECT_FALSE(delegate_->IsAccessValid(CreateFileSystemURL("..."))); + EXPECT_FALSE(IsAccessValid(CreateFileSystemURL("..."))); // These are identified as unsafe cases due to weird path handling // on Windows. - EXPECT_FALSE(delegate_->IsAccessValid(CreateFileSystemURL(" .."))); - EXPECT_FALSE(delegate_->IsAccessValid(CreateFileSystemURL(".. "))); + EXPECT_FALSE(IsAccessValid(CreateFileSystemURL(" .."))); + EXPECT_FALSE(IsAccessValid(CreateFileSystemURL(".. "))); // Similar but safe cases. - EXPECT_TRUE(delegate_->IsAccessValid(CreateFileSystemURL(" ."))); - EXPECT_TRUE(delegate_->IsAccessValid(CreateFileSystemURL(". "))); - EXPECT_TRUE(delegate_->IsAccessValid(CreateFileSystemURL("b."))); - EXPECT_TRUE(delegate_->IsAccessValid(CreateFileSystemURL(".b"))); + EXPECT_TRUE(IsAccessValid(CreateFileSystemURL(" ."))); + EXPECT_TRUE(IsAccessValid(CreateFileSystemURL(". "))); + EXPECT_TRUE(IsAccessValid(CreateFileSystemURL("b."))); + EXPECT_TRUE(IsAccessValid(CreateFileSystemURL(".b"))); // A path that looks like a drive letter. - EXPECT_TRUE(delegate_->IsAccessValid(CreateFileSystemURL("c:"))); + EXPECT_TRUE(IsAccessValid(CreateFileSystemURL("c:"))); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/sandbox_file_system_backend_unittest.cc b/content/browser/fileapi/sandbox_file_system_backend_unittest.cc index 4bb1226..8b695ec 100644 --- a/content/browser/fileapi/sandbox_file_system_backend_unittest.cc +++ b/content/browser/fileapi/sandbox_file_system_backend_unittest.cc @@ -20,6 +20,9 @@ #include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h" #include "webkit/common/fileapi/file_system_util.h" +using fileapi::SandboxFileSystemBackend; +using fileapi::SandboxFileSystemBackendDelegate; + // PS stands for path separator. #if defined(FILE_PATH_USES_WIN_SEPARATORS) #define PS "\\" @@ -27,7 +30,7 @@ #define PS "/" #endif -namespace fileapi { +namespace content { namespace { @@ -82,7 +85,7 @@ class SandboxFileSystemBackendTest : public testing::Test { SetUpNewDelegate(CreateAllowFileAccessOptions()); } - void SetUpNewDelegate(const FileSystemOptions& options) { + void SetUpNewDelegate(const fileapi::FileSystemOptions& options) { delegate_.reset(new SandboxFileSystemBackendDelegate( NULL /* quota_manager_proxy */, base::MessageLoopProxy::current().get(), @@ -91,12 +94,12 @@ class SandboxFileSystemBackendTest : public testing::Test { options)); } - void SetUpNewBackend(const FileSystemOptions& options) { + void SetUpNewBackend(const fileapi::FileSystemOptions& options) { SetUpNewDelegate(options); backend_.reset(new SandboxFileSystemBackend(delegate_.get())); } - SandboxFileSystemBackendDelegate::OriginEnumerator* + fileapi::SandboxFileSystemBackendDelegate::OriginEnumerator* CreateOriginEnumerator() const { return backend_->CreateOriginEnumerator(); } @@ -111,7 +114,7 @@ class SandboxFileSystemBackendTest : public testing::Test { bool GetRootPath(const GURL& origin_url, fileapi::FileSystemType type, - OpenFileSystemMode mode, + fileapi::OpenFileSystemMode mode, base::FilePath* root_path) { base::PlatformFileError error = base::PLATFORM_FILE_OK; backend_->OpenFileSystem( @@ -135,8 +138,8 @@ class SandboxFileSystemBackendTest : public testing::Test { base::ScopedTempDir data_dir_; base::MessageLoop message_loop_; - scoped_ptr<SandboxFileSystemBackendDelegate> delegate_; - scoped_ptr<SandboxFileSystemBackend> backend_; + scoped_ptr<fileapi::SandboxFileSystemBackendDelegate> delegate_; + scoped_ptr<fileapi::SandboxFileSystemBackend> backend_; }; TEST_F(SandboxFileSystemBackendTest, Empty) { @@ -170,7 +173,7 @@ TEST_F(SandboxFileSystemBackendTest, EnumerateOrigins) { } for (size_t i = 0; i < persistent_size; ++i) { CreateOriginTypeDirectory(GURL(persistent_origins[i]), - kFileSystemTypePersistent); + fileapi::kFileSystemTypePersistent); persistent_set.insert(GURL(persistent_origins[i])); } @@ -181,11 +184,11 @@ TEST_F(SandboxFileSystemBackendTest, EnumerateOrigins) { GURL current; while (!(current = enumerator->Next()).is_empty()) { SCOPED_TRACE(testing::Message() << "EnumerateOrigin " << current.spec()); - if (enumerator->HasFileSystemType(kFileSystemTypeTemporary)) { + if (enumerator->HasFileSystemType(fileapi::kFileSystemTypeTemporary)) { ASSERT_TRUE(temporary_set.find(current) != temporary_set.end()); ++temporary_actual_size; } - if (enumerator->HasFileSystemType(kFileSystemTypePersistent)) { + if (enumerator->HasFileSystemType(fileapi::kFileSystemTypePersistent)) { ASSERT_TRUE(persistent_set.find(current) != persistent_set.end()); ++persistent_actual_size; } @@ -208,7 +211,7 @@ TEST_F(SandboxFileSystemBackendTest, GetRootPathCreateAndExamine) { base::FilePath root_path; EXPECT_TRUE(GetRootPath(GURL(kRootPathTestCases[i].origin_url), kRootPathTestCases[i].type, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, &root_path)); base::FilePath expected = file_system_path().AppendASCII( @@ -228,7 +231,7 @@ TEST_F(SandboxFileSystemBackendTest, GetRootPathCreateAndExamine) { base::FilePath root_path; EXPECT_TRUE(GetRootPath(GURL(kRootPathTestCases[i].origin_url), kRootPathTestCases[i].type, - OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT, &root_path)); ASSERT_TRUE(returned_root_path.size() > i); EXPECT_EQ(returned_root_path[i].value(), root_path.value()); @@ -244,14 +247,14 @@ TEST_F(SandboxFileSystemBackendTest, GURL origin_url("http://foo.com:1/"); base::FilePath root_path1; - EXPECT_TRUE(GetRootPath(origin_url, kFileSystemTypeTemporary, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + EXPECT_TRUE(GetRootPath(origin_url, fileapi::kFileSystemTypeTemporary, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, &root_path1)); SetUpNewBackend(CreateDisallowFileAccessOptions()); base::FilePath root_path2; - EXPECT_TRUE(GetRootPath(origin_url, kFileSystemTypeTemporary, - OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT, + EXPECT_TRUE(GetRootPath(origin_url, fileapi::kFileSystemTypeTemporary, + fileapi::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT, &root_path2)); EXPECT_EQ(root_path1.value(), root_path2.value()); @@ -266,7 +269,7 @@ TEST_F(SandboxFileSystemBackendTest, GetRootPathGetWithoutCreate) { << kRootPathTestCases[i].expected_path); EXPECT_FALSE(GetRootPath(GURL(kRootPathTestCases[i].origin_url), kRootPathTestCases[i].type, - OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_FAIL_IF_NONEXISTENT, NULL)); } } @@ -281,7 +284,7 @@ TEST_F(SandboxFileSystemBackendTest, GetRootPathInIncognito) { EXPECT_FALSE( GetRootPath(GURL(kRootPathTestCases[i].origin_url), kRootPathTestCases[i].type, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, NULL)); } } @@ -294,7 +297,7 @@ TEST_F(SandboxFileSystemBackendTest, GetRootPathFileURI) { EXPECT_FALSE( GetRootPath(GURL(kRootPathFileURITestCases[i].origin_url), kRootPathFileURITestCases[i].type, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, NULL)); } } @@ -307,7 +310,7 @@ TEST_F(SandboxFileSystemBackendTest, GetRootPathFileURIWithAllowFlag) { base::FilePath root_path; EXPECT_TRUE(GetRootPath(GURL(kRootPathFileURITestCases[i].origin_url), kRootPathFileURITestCases[i].type, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, &root_path)); base::FilePath expected = file_system_path().AppendASCII( kRootPathFileURITestCases[i].expected_path); @@ -316,4 +319,4 @@ TEST_F(SandboxFileSystemBackendTest, GetRootPathFileURIWithAllowFlag) { } } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/transient_file_util_unittest.cc b/content/browser/fileapi/transient_file_util_unittest.cc index 2ddb315..66d4ad5 100644 --- a/content/browser/fileapi/transient_file_util_unittest.cc +++ b/content/browser/fileapi/transient_file_util_unittest.cc @@ -17,7 +17,9 @@ #include "webkit/browser/fileapi/transient_file_util.h" #include "webkit/common/blob/scoped_file.h" -namespace fileapi { +using fileapi::FileSystemURL; + +namespace content { class TransientFileUtilTest : public testing::Test { public: @@ -27,7 +29,7 @@ class TransientFileUtilTest : public testing::Test { virtual void SetUp() OVERRIDE { file_system_context_ = CreateFileSystemContextForTesting( NULL, base::FilePath(FILE_PATH_LITERAL("dummy"))); - transient_file_util_.reset(new TransientFileUtil); + transient_file_util_.reset(new fileapi::TransientFileUtil); ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); } @@ -41,10 +43,11 @@ class TransientFileUtilTest : public testing::Test { FileSystemURL* file_url, base::FilePath* file_path) { EXPECT_TRUE(base::CreateTemporaryFileInDir(data_dir_.path(), file_path)); - IsolatedContext* isolated_context = IsolatedContext::GetInstance(); + fileapi::IsolatedContext* isolated_context = + fileapi::IsolatedContext::GetInstance(); std::string name = "tmp"; std::string fsid = isolated_context->RegisterFileSystemForPath( - kFileSystemTypeForTransientFile, + fileapi::kFileSystemTypeForTransientFile, *file_path, &name); ASSERT_TRUE(!fsid.empty()); @@ -52,22 +55,24 @@ class TransientFileUtilTest : public testing::Test { fsid).AppendASCII(name); *file_url = file_system_context_->CreateCrackedFileSystemURL( GURL("http://foo"), - kFileSystemTypeIsolated, + fileapi::kFileSystemTypeIsolated, virtual_path); } - scoped_ptr<FileSystemOperationContext> NewOperationContext() { + scoped_ptr<fileapi::FileSystemOperationContext> NewOperationContext() { return make_scoped_ptr( - new FileSystemOperationContext(file_system_context_.get())); + new fileapi::FileSystemOperationContext(file_system_context_.get())); } - FileSystemFileUtil* file_util() { return transient_file_util_.get(); } + fileapi::FileSystemFileUtil* file_util() { + return transient_file_util_.get(); + } private: base::MessageLoop message_loop_; base::ScopedTempDir data_dir_; - scoped_refptr<FileSystemContext> file_system_context_; - scoped_ptr<TransientFileUtil> transient_file_util_; + scoped_refptr<fileapi::FileSystemContext> file_system_context_; + scoped_ptr<fileapi::TransientFileUtil> transient_file_util_; DISALLOW_COPY_AND_ASSIGN(TransientFileUtilTest); }; @@ -118,4 +123,4 @@ TEST_F(TransientFileUtilTest, TransientFile) { temp_url, &file_info, &path)); } -} // namespace fileapi +} // namespace content diff --git a/content/browser/fileapi/upload_file_system_file_element_reader_unittest.cc b/content/browser/fileapi/upload_file_system_file_element_reader_unittest.cc index 4ae03b9..b0973d3 100644 --- a/content/browser/fileapi/upload_file_system_file_element_reader_unittest.cc +++ b/content/browser/fileapi/upload_file_system_file_element_reader_unittest.cc @@ -17,7 +17,13 @@ #include "webkit/browser/fileapi/file_system_operation_context.h" #include "webkit/browser/fileapi/file_system_url.h" -namespace fileapi { +using fileapi::AsyncFileTestHelper; +using fileapi::FileSystemContext; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; +using fileapi::UploadFileSystemFileElementReader; + +namespace content { namespace { @@ -34,13 +40,13 @@ class UploadFileSystemFileElementReaderTest : public testing::Test { virtual void SetUp() OVERRIDE { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - file_system_context_ = fileapi::CreateFileSystemContextForTesting( + file_system_context_ = CreateFileSystemContextForTesting( NULL, temp_dir_.path()); file_system_context_->OpenFileSystem( GURL(kFileSystemURLOrigin), kFileSystemType, - OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, + fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT, base::Bind(&UploadFileSystemFileElementReaderTest::OnOpenFileSystem, base::Unretained(this))); base::RunLoop().RunUntilIdle(); @@ -275,4 +281,4 @@ TEST_F(UploadFileSystemFileElementReaderTest, WrongURL) { EXPECT_EQ(net::ERR_FILE_NOT_FOUND, init_callback.WaitForResult()); } -} // namespace fileapi +} // namespace content diff --git a/content/public/test/sandbox_file_system_test_helper.cc b/content/public/test/sandbox_file_system_test_helper.cc index d3176b2..1e294b7 100644 --- a/content/public/test/sandbox_file_system_test_helper.cc +++ b/content/public/test/sandbox_file_system_test_helper.cc @@ -19,7 +19,13 @@ #include "webkit/browser/quota/mock_special_storage_policy.h" #include "webkit/common/fileapi/file_system_util.h" -namespace fileapi { +using fileapi::FileSystemContext; +using fileapi::FileSystemOperationContext; +using fileapi::FileSystemOperationRunner; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; + +namespace content { SandboxFileSystemTestHelper::SandboxFileSystemTestHelper( const GURL& origin, FileSystemType type) @@ -28,7 +34,7 @@ SandboxFileSystemTestHelper::SandboxFileSystemTestHelper( SandboxFileSystemTestHelper::SandboxFileSystemTestHelper() : origin_(GURL("http://foo.com")), - type_(kFileSystemTypeTemporary), + type_(fileapi::kFileSystemTypeTemporary), file_util_(NULL) { } @@ -99,7 +105,7 @@ int64 SandboxFileSystemTestHelper::ComputeCurrentOriginUsage() { usage_cache()->CloseCacheFiles(); int64 size = base::ComputeDirectorySize(GetOriginRootPath()); if (base::PathExists(GetUsageCachePath())) - size -= FileSystemUsageCache::kUsageFileSize; + size -= fileapi::FileSystemUsageCache::kUsageFileSize; return size; } @@ -124,12 +130,12 @@ SandboxFileSystemTestHelper::NewOperationContext() { } void SandboxFileSystemTestHelper::AddFileChangeObserver( - FileChangeObserver* observer) { + fileapi::FileChangeObserver* observer) { file_system_context_->sandbox_backend()->GetQuotaUtil()-> AddFileChangeObserver(type_, observer, NULL); } -FileSystemUsageCache* SandboxFileSystemTestHelper::usage_cache() { +fileapi::FileSystemUsageCache* SandboxFileSystemTestHelper::usage_cache() { return file_system_context()->sandbox_delegate()->usage_cache(); } @@ -150,4 +156,4 @@ void SandboxFileSystemTestHelper::SetUpFileSystem() { usage_cache()->UpdateUsage(usage_cache_path, 0); } -} // namespace fileapi +} // namespace content diff --git a/content/public/test/sandbox_file_system_test_helper.h b/content/public/test/sandbox_file_system_test_helper.h index 9a4271d..e182b4f 100644 --- a/content/public/test/sandbox_file_system_test_helper.h +++ b/content/public/test/sandbox_file_system_test_helper.h @@ -26,18 +26,20 @@ class QuotaManagerProxy; } namespace fileapi { - class FileSystemContext; class FileSystemFileUtil; class FileSystemOperationContext; class FileSystemOperationRunner; +} + +namespace content { // Filesystem test helper class that encapsulates test environment for // a given {origin, type} pair. This helper only works for sandboxed // file systems (Temporary or Persistent). class SandboxFileSystemTestHelper { public: - SandboxFileSystemTestHelper(const GURL& origin, FileSystemType type); + SandboxFileSystemTestHelper(const GURL& origin, fileapi::FileSystemType type); SandboxFileSystemTestHelper(); ~SandboxFileSystemTestHelper(); @@ -46,7 +48,7 @@ class SandboxFileSystemTestHelper { // a single base directory, they have to share a context, so that they don't // have multiple databases fighting over the lock to the origin directory // [deep down inside ObfuscatedFileUtil]. - void SetUp(FileSystemContext* file_system_context); + void SetUp(fileapi::FileSystemContext* file_system_context); void SetUp(const base::FilePath& base_dir, quota::QuotaManagerProxy* quota_manager_proxy); void TearDown(); @@ -58,8 +60,8 @@ class SandboxFileSystemTestHelper { // Returns empty path if filesystem type is neither temporary nor persistent. base::FilePath GetUsageCachePath() const; - FileSystemURL CreateURL(const base::FilePath& path) const; - FileSystemURL CreateURLFromUTF8(const std::string& utf8) const { + fileapi::FileSystemURL CreateURL(const base::FilePath& path) const; + fileapi::FileSystemURL CreateURLFromUTF8(const std::string& utf8) const { return CreateURL(base::FilePath::FromUTF8Unsafe(utf8)); } @@ -71,33 +73,33 @@ class SandboxFileSystemTestHelper { int64 ComputeCurrentDirectoryDatabaseUsage(); - FileSystemOperationRunner* operation_runner(); - FileSystemOperationContext* NewOperationContext(); + fileapi::FileSystemOperationRunner* operation_runner(); + fileapi::FileSystemOperationContext* NewOperationContext(); - void AddFileChangeObserver(FileChangeObserver* observer); + void AddFileChangeObserver(fileapi::FileChangeObserver* observer); - FileSystemContext* file_system_context() const { + fileapi::FileSystemContext* file_system_context() const { return file_system_context_.get(); } const GURL& origin() const { return origin_; } - FileSystemType type() const { return type_; } + fileapi::FileSystemType type() const { return type_; } quota::StorageType storage_type() const { - return FileSystemTypeToQuotaStorageType(type_); + return fileapi::FileSystemTypeToQuotaStorageType(type_); } - FileSystemFileUtil* file_util() const { return file_util_; } - FileSystemUsageCache* usage_cache(); + fileapi::FileSystemFileUtil* file_util() const { return file_util_; } + fileapi::FileSystemUsageCache* usage_cache(); private: void SetUpFileSystem(); - scoped_refptr<FileSystemContext> file_system_context_; + scoped_refptr<fileapi::FileSystemContext> file_system_context_; const GURL origin_; - const FileSystemType type_; - FileSystemFileUtil* file_util_; + const fileapi::FileSystemType type_; + fileapi::FileSystemFileUtil* file_util_; }; -} // namespace fileapi +} // namespace content #endif // CONTENT_PUBLIC_TEST_SANDBOX_FILE_SYSTEM_TEST_HELPER_H_ diff --git a/content/public/test/test_file_system_backend.cc b/content/public/test/test_file_system_backend.cc index d1c2bc8..c2a29fa 100644 --- a/content/public/test/test_file_system_backend.cc +++ b/content/public/test/test_file_system_backend.cc @@ -23,11 +23,17 @@ #include "webkit/browser/quota/quota_manager.h" #include "webkit/common/fileapi/file_system_util.h" -namespace fileapi { +using fileapi::FileSystemContext; +using fileapi::FileSystemOperation; +using fileapi::FileSystemOperationContext; +using fileapi::FileSystemType; +using fileapi::FileSystemURL; + +namespace content { namespace { -class TestFileUtil : public LocalFileUtil { +class TestFileUtil : public fileapi::LocalFileUtil { public: explicit TestFileUtil(const base::FilePath& base_path) : base_path_(base_path) {} @@ -50,8 +56,8 @@ class TestFileUtil : public LocalFileUtil { // This only supports single origin. class TestFileSystemBackend::QuotaUtil - : public FileSystemQuotaUtil, - public FileUpdateObserver { + : public fileapi::FileSystemQuotaUtil, + public fileapi::FileUpdateObserver { public: explicit QuotaUtil(base::SequencedTaskRunner* task_runner) : usage_(0), @@ -70,12 +76,12 @@ class TestFileSystemBackend::QuotaUtil return base::PLATFORM_FILE_OK; } - virtual scoped_refptr<QuotaReservation> + virtual scoped_refptr<fileapi::QuotaReservation> CreateQuotaReservationOnFileTaskRunner( const GURL& origin_url, FileSystemType type) OVERRIDE { NOTREACHED(); - return scoped_refptr<QuotaReservation>(); + return scoped_refptr<fileapi::QuotaReservation>(); } virtual void GetOriginsForTypeOnFileTaskRunner( @@ -107,29 +113,29 @@ class TestFileSystemBackend::QuotaUtil virtual void AddFileChangeObserver( FileSystemType type, - FileChangeObserver* observer, + fileapi::FileChangeObserver* observer, base::SequencedTaskRunner* task_runner) OVERRIDE { change_observers_ = change_observers_.AddObserver(observer, task_runner); } virtual void AddFileAccessObserver( FileSystemType type, - FileAccessObserver* observer, + fileapi::FileAccessObserver* observer, base::SequencedTaskRunner* task_runner) OVERRIDE { NOTIMPLEMENTED(); } - virtual const UpdateObserverList* GetUpdateObservers( + virtual const fileapi::UpdateObserverList* GetUpdateObservers( FileSystemType type) const OVERRIDE { return &update_observers_; } - virtual const ChangeObserverList* GetChangeObservers( + virtual const fileapi::ChangeObserverList* GetChangeObservers( FileSystemType type) const OVERRIDE { return &change_observers_; } - virtual const AccessObserverList* GetAccessObservers( + virtual const fileapi::AccessObserverList* GetAccessObservers( FileSystemType type) const OVERRIDE { NOTIMPLEMENTED(); return NULL; @@ -149,15 +155,16 @@ class TestFileSystemBackend::QuotaUtil scoped_refptr<base::SequencedTaskRunner> task_runner_; - UpdateObserverList update_observers_; - ChangeObserverList change_observers_; + fileapi::UpdateObserverList update_observers_; + fileapi::ChangeObserverList change_observers_; }; TestFileSystemBackend::TestFileSystemBackend( base::SequencedTaskRunner* task_runner, const base::FilePath& base_path) : base_path_(base_path), - file_util_(new AsyncFileUtilAdapter(new TestFileUtil(base_path))), + file_util_( + new fileapi::AsyncFileUtilAdapter(new TestFileUtil(base_path))), quota_util_(new QuotaUtil(task_runner)), require_copy_or_move_validator_(false) { } @@ -166,7 +173,7 @@ TestFileSystemBackend::~TestFileSystemBackend() { } bool TestFileSystemBackend::CanHandleType(FileSystemType type) const { - return (type == kFileSystemTypeTest); + return (type == fileapi::kFileSystemTypeTest); } void TestFileSystemBackend::Initialize(FileSystemContext* context) { @@ -175,18 +182,19 @@ void TestFileSystemBackend::Initialize(FileSystemContext* context) { void TestFileSystemBackend::OpenFileSystem( const GURL& origin_url, FileSystemType type, - OpenFileSystemMode mode, + fileapi::OpenFileSystemMode mode, const OpenFileSystemCallback& callback) { callback.Run(GetFileSystemRootURI(origin_url, type), GetFileSystemName(origin_url, type), base::PLATFORM_FILE_OK); } -AsyncFileUtil* TestFileSystemBackend::GetAsyncFileUtil(FileSystemType type) { +fileapi::AsyncFileUtil* TestFileSystemBackend::GetAsyncFileUtil( + FileSystemType type) { return file_util_.get(); } -CopyOrMoveFileValidatorFactory* +fileapi::CopyOrMoveFileValidatorFactory* TestFileSystemBackend::GetCopyOrMoveFileValidatorFactory( FileSystemType type, base::PlatformFileError* error_code) { DCHECK(error_code); @@ -200,7 +208,7 @@ TestFileSystemBackend::GetCopyOrMoveFileValidatorFactory( } void TestFileSystemBackend::InitializeCopyOrMoveFileValidatorFactory( - scoped_ptr<CopyOrMoveFileValidatorFactory> factory) { + scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) { if (!copy_or_move_file_validator_factory_) copy_or_move_file_validator_factory_ = factory.Pass(); } @@ -234,23 +242,23 @@ TestFileSystemBackend::CreateFileStreamWriter( int64 offset, FileSystemContext* context) const { return scoped_ptr<fileapi::FileStreamWriter>( - new SandboxFileStreamWriter(context, url, offset, - *GetUpdateObservers(url.type()))); + new fileapi::SandboxFileStreamWriter(context, url, offset, + *GetUpdateObservers(url.type()))); } -FileSystemQuotaUtil* TestFileSystemBackend::GetQuotaUtil() { +fileapi::FileSystemQuotaUtil* TestFileSystemBackend::GetQuotaUtil() { return quota_util_.get(); } -const UpdateObserverList* TestFileSystemBackend::GetUpdateObservers( +const fileapi::UpdateObserverList* TestFileSystemBackend::GetUpdateObservers( FileSystemType type) const { return quota_util_->GetUpdateObservers(type); } void TestFileSystemBackend::AddFileChangeObserver( - FileChangeObserver* observer) { + fileapi::FileChangeObserver* observer) { quota_util_->AddFileChangeObserver( - kFileSystemTypeTest, observer, quota_util_->task_runner()); + fileapi::kFileSystemTypeTest, observer, quota_util_->task_runner()); } -} // namespace fileapi +} // namespace content diff --git a/content/public/test/test_file_system_backend.h b/content/public/test/test_file_system_backend.h index be7f9f7..4b49747 100644 --- a/content/public/test/test_file_system_backend.h +++ b/content/public/test/test_file_system_backend.h @@ -17,14 +17,16 @@ class SequencedTaskRunner; } namespace fileapi { - class AsyncFileUtilAdapter; class FileSystemQuotaUtil; +} + +namespace content { // This should be only used for testing. // This file system backend uses LocalFileUtil and stores data file // under the given directory. -class TestFileSystemBackend : public FileSystemBackend { +class TestFileSystemBackend : public fileapi::FileSystemBackend { public: TestFileSystemBackend( base::SequencedTaskRunner* task_runner, @@ -32,39 +34,42 @@ class TestFileSystemBackend : public FileSystemBackend { virtual ~TestFileSystemBackend(); // FileSystemBackend implementation. - virtual bool CanHandleType(FileSystemType type) const OVERRIDE; - virtual void Initialize(FileSystemContext* context) OVERRIDE; + virtual bool CanHandleType(fileapi::FileSystemType type) const OVERRIDE; + virtual void Initialize(fileapi::FileSystemContext* context) OVERRIDE; virtual void OpenFileSystem( const GURL& origin_url, - FileSystemType type, - OpenFileSystemMode mode, + fileapi::FileSystemType type, + fileapi::OpenFileSystemMode mode, const OpenFileSystemCallback& callback) OVERRIDE; - virtual AsyncFileUtil* GetAsyncFileUtil(FileSystemType type) OVERRIDE; - virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory( - FileSystemType type, + virtual fileapi::AsyncFileUtil* GetAsyncFileUtil( + fileapi::FileSystemType type) OVERRIDE; + virtual fileapi::CopyOrMoveFileValidatorFactory* + GetCopyOrMoveFileValidatorFactory( + fileapi::FileSystemType type, base::PlatformFileError* error_code) OVERRIDE; - virtual FileSystemOperation* CreateFileSystemOperation( - const FileSystemURL& url, - FileSystemContext* context, + virtual fileapi::FileSystemOperation* CreateFileSystemOperation( + const fileapi::FileSystemURL& url, + fileapi::FileSystemContext* context, base::PlatformFileError* error_code) const OVERRIDE; virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader( - const FileSystemURL& url, + const fileapi::FileSystemURL& url, int64 offset, const base::Time& expected_modification_time, - FileSystemContext* context) const OVERRIDE; - virtual scoped_ptr<FileStreamWriter> CreateFileStreamWriter( - const FileSystemURL& url, + fileapi::FileSystemContext* context) const OVERRIDE; + virtual scoped_ptr<fileapi::FileStreamWriter> CreateFileStreamWriter( + const fileapi::FileSystemURL& url, int64 offset, - FileSystemContext* context) const OVERRIDE; - virtual FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE; + fileapi::FileSystemContext* context) const OVERRIDE; + virtual fileapi::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE; // Initialize the CopyOrMoveFileValidatorFactory. Invalid to call more than // once. void InitializeCopyOrMoveFileValidatorFactory( - scoped_ptr<CopyOrMoveFileValidatorFactory> factory); + scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory); - const UpdateObserverList* GetUpdateObservers(FileSystemType type) const; - void AddFileChangeObserver(FileChangeObserver* observer); + const fileapi::UpdateObserverList* + GetUpdateObservers(fileapi::FileSystemType type) const; + void AddFileChangeObserver(fileapi::FileChangeObserver* observer); // For CopyOrMoveFileValidatorFactory testing. Once it's set to true // GetCopyOrMoveFileValidatorFactory will start returning security @@ -78,16 +83,16 @@ class TestFileSystemBackend : public FileSystemBackend { base::FilePath base_path_; scoped_refptr<base::SequencedTaskRunner> task_runner_; - scoped_ptr<AsyncFileUtilAdapter> file_util_; + scoped_ptr<fileapi::AsyncFileUtilAdapter> file_util_; scoped_ptr<QuotaUtil> quota_util_; bool require_copy_or_move_validator_; - scoped_ptr<CopyOrMoveFileValidatorFactory> + scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> copy_or_move_file_validator_factory_; DISALLOW_COPY_AND_ASSIGN(TestFileSystemBackend); }; -} // namespace fileapi +} // namespace content #endif // CONTENT_PUBLIC_TEST_TEST_FILE_SYSTEM_BACKEND_H_ diff --git a/content/public/test/test_file_system_context.cc b/content/public/test/test_file_system_context.cc index b189d5d..d09bbd1 100644 --- a/content/public/test/test_file_system_context.cc +++ b/content/public/test/test_file_system_context.cc @@ -12,26 +12,27 @@ #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/quota/mock_special_storage_policy.h" -namespace fileapi { +namespace content { -FileSystemContext* CreateFileSystemContextForTesting( +fileapi::FileSystemContext* CreateFileSystemContextForTesting( quota::QuotaManagerProxy* quota_manager_proxy, const base::FilePath& base_path) { - ScopedVector<FileSystemBackend> additional_providers; + ScopedVector<fileapi::FileSystemBackend> additional_providers; additional_providers.push_back(new TestFileSystemBackend( base::MessageLoopProxy::current().get(), base_path)); return CreateFileSystemContextWithAdditionalProvidersForTesting( quota_manager_proxy, additional_providers.Pass(), base_path); } -FileSystemContext* CreateFileSystemContextWithAdditionalProvidersForTesting( +fileapi::FileSystemContext* +CreateFileSystemContextWithAdditionalProvidersForTesting( quota::QuotaManagerProxy* quota_manager_proxy, - ScopedVector<FileSystemBackend> additional_providers, + ScopedVector<fileapi::FileSystemBackend> additional_providers, const base::FilePath& base_path) { - return new FileSystemContext( + return new fileapi::FileSystemContext( base::MessageLoopProxy::current().get(), base::MessageLoopProxy::current().get(), - ExternalMountPoints::CreateRefCounted().get(), + fileapi::ExternalMountPoints::CreateRefCounted().get(), make_scoped_refptr(new quota::MockSpecialStoragePolicy()).get(), quota_manager_proxy, additional_providers.Pass(), @@ -39,14 +40,14 @@ FileSystemContext* CreateFileSystemContextWithAdditionalProvidersForTesting( CreateAllowFileAccessOptions()); } -FileSystemContext* CreateIncognitoFileSystemContextForTesting( +fileapi::FileSystemContext* CreateIncognitoFileSystemContextForTesting( quota::QuotaManagerProxy* quota_manager_proxy, const base::FilePath& base_path) { - ScopedVector<FileSystemBackend> additional_providers; - return new FileSystemContext( + ScopedVector<fileapi::FileSystemBackend> additional_providers; + return new fileapi::FileSystemContext( base::MessageLoopProxy::current().get(), base::MessageLoopProxy::current().get(), - ExternalMountPoints::CreateRefCounted().get(), + fileapi::ExternalMountPoints::CreateRefCounted().get(), make_scoped_refptr(new quota::MockSpecialStoragePolicy()).get(), quota_manager_proxy, additional_providers.Pass(), @@ -54,4 +55,4 @@ FileSystemContext* CreateIncognitoFileSystemContextForTesting( CreateIncognitoFileSystemOptions()); } -} // namespace fileapi +} // namespace content diff --git a/content/public/test/test_file_system_context.h b/content/public/test/test_file_system_context.h index 5539c4b..19a4fc4 100644 --- a/content/public/test/test_file_system_context.h +++ b/content/public/test/test_file_system_context.h @@ -14,25 +14,28 @@ class SpecialStoragePolicy; } namespace fileapi { - class FileSystemContext; class FileSystemBackend; +} + +namespace content { -FileSystemContext* CreateFileSystemContextForTesting( +fileapi::FileSystemContext* CreateFileSystemContextForTesting( quota::QuotaManagerProxy* quota_manager_proxy, const base::FilePath& base_path); // The caller is responsible for including TestFileSystemBackend in // |additional_providers| if needed. -FileSystemContext* CreateFileSystemContextWithAdditionalProvidersForTesting( +fileapi::FileSystemContext* +CreateFileSystemContextWithAdditionalProvidersForTesting( quota::QuotaManagerProxy* quota_manager_proxy, - ScopedVector<FileSystemBackend> additional_providers, + ScopedVector<fileapi::FileSystemBackend> additional_providers, const base::FilePath& base_path); -FileSystemContext* CreateIncognitoFileSystemContextForTesting( +fileapi::FileSystemContext* CreateIncognitoFileSystemContextForTesting( quota::QuotaManagerProxy* quota_manager_proxy, const base::FilePath& base_path); -} // namespace fileapi +} // namespace content #endif // CONTENT_PUBLIC_TEST_TEST_FILE_SYSTEM_CONTEXT_H_ diff --git a/content/public/test/test_file_system_options.cc b/content/public/test/test_file_system_options.cc index c63808b..81c4642 100644 --- a/content/public/test/test_file_system_options.cc +++ b/content/public/test/test_file_system_options.cc @@ -7,7 +7,9 @@ #include <string> #include <vector> -namespace fileapi { +using fileapi::FileSystemOptions; + +namespace content { FileSystemOptions CreateIncognitoFileSystemOptions() { std::vector<std::string> additional_allowed_schemes; @@ -37,4 +39,4 @@ FileSystemOptions CreateDisallowFileAccessOptions() { additional_allowed_schemes); }; -} // namespace fileapi +} // namespace content diff --git a/content/public/test/test_file_system_options.h b/content/public/test/test_file_system_options.h index 52f19d1..29a25c1 100644 --- a/content/public/test/test_file_system_options.h +++ b/content/public/test/test_file_system_options.h @@ -7,17 +7,17 @@ #include "webkit/browser/fileapi/file_system_options.h" -namespace fileapi { +namespace content { // Returns Filesystem options for incognito mode. -FileSystemOptions CreateIncognitoFileSystemOptions(); +fileapi::FileSystemOptions CreateIncognitoFileSystemOptions(); // Returns Filesystem options that allow file access. -FileSystemOptions CreateAllowFileAccessOptions(); +fileapi::FileSystemOptions CreateAllowFileAccessOptions(); // Returns Filesystem options that disallow file access. -FileSystemOptions CreateDisallowFileAccessOptions(); +fileapi::FileSystemOptions CreateDisallowFileAccessOptions(); -} // namespace fileapi +} // namespace content #endif // CONTENT_PUBLIC_TEST_TEST_FILE_SYSTEM_OPTIONS_H_ diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index 5637d42..7c8e1a9 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -53,21 +53,11 @@ class AppCacheURLRequestJobTest; // Temporary layering violation to allow existing users of a deprecated // interface. namespace content { -class ResourceDispatcherHostTest; -} - -// Temporary layering violation to allow existing users of a deprecated -// interface. -namespace fileapi { +class BlobURLRequestJobTest; class FileSystemDirURLRequestJobTest; class FileSystemURLRequestJobTest; class FileWriterDelegateTest; -} - -// Temporary layering violation to allow existing users of a deprecated -// interface. -namespace webkit_blob { -class BlobURLRequestJobTest; +class ResourceDispatcherHostTest; } namespace net { @@ -180,11 +170,11 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe), friend class appcache::AppCacheInterceptor; friend class appcache::AppCacheRequestHandlerTest; friend class appcache::AppCacheURLRequestJobTest; + friend class content::BlobURLRequestJobTest; + friend class content::FileSystemDirURLRequestJobTest; + friend class content::FileSystemURLRequestJobTest; + friend class content::FileWriterDelegateTest; friend class content::ResourceDispatcherHostTest; - friend class fileapi::FileSystemDirURLRequestJobTest; - friend class fileapi::FileSystemURLRequestJobTest; - friend class fileapi::FileWriterDelegateTest; - friend class webkit_blob::BlobURLRequestJobTest; // Use URLRequestJobFactory::ProtocolHandler instead. static ProtocolFactory* RegisterProtocolFactory(const std::string& scheme, diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h index d66a273..9f81bba 100644 --- a/webkit/browser/fileapi/file_system_context.h +++ b/webkit/browser/fileapi/file_system_context.h @@ -273,10 +273,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext friend class FileSystemOperationRunner; // For sandbox_backend(). - friend class SandboxFileSystemTestHelper; + friend class content::SandboxFileSystemTestHelper; // For plugin_private_backend(). - friend class PluginPrivateFileSystemBackendTest; + friend class content::PluginPrivateFileSystemBackendTest; // Deleters. friend struct DefaultContextDeleter; diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.h b/webkit/browser/fileapi/file_system_file_stream_reader.h index 3a90663..4d36c42 100644 --- a/webkit/browser/fileapi/file_system_file_stream_reader.h +++ b/webkit/browser/fileapi/file_system_file_stream_reader.h @@ -19,6 +19,10 @@ class FilePath; class SequencedTaskRunner; } +namespace content { +class FileSystemFileStreamReaderTest; +} + namespace fileapi { class FileSystemContext; @@ -41,7 +45,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemFileStreamReader private: friend class webkit_blob::FileStreamReader; - friend class FileSystemFileStreamReaderTest; + friend class content::FileSystemFileStreamReaderTest; FileSystemFileStreamReader(FileSystemContext* file_system_context, const FileSystemURL& url, diff --git a/webkit/browser/fileapi/obfuscated_file_util.h b/webkit/browser/fileapi/obfuscated_file_util.h index 05d5530..7b14779 100644 --- a/webkit/browser/fileapi/obfuscated_file_util.h +++ b/webkit/browser/fileapi/obfuscated_file_util.h @@ -29,6 +29,10 @@ class SequencedTaskRunner; class TimeTicks; } +namespace content { +class ObfuscatedFileUtilTest; +} + namespace quota { class SpecialStoragePolicy; } @@ -229,17 +233,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE ObfuscatedFileUtil typedef SandboxDirectoryDatabase::FileInfo FileInfo; friend class ObfuscatedFileEnumerator; - friend class ObfuscatedFileUtilTest; friend class QuotaBackendImplTest; - FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest, MaybeDropDatabasesAliveCase); - FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest, - MaybeDropDatabasesAlreadyDeletedCase); - FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest, - DestroyDirectoryDatabase_Isolated); - FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest, - GetDirectoryDatabase_Isolated); - FRIEND_TEST_ALL_PREFIXES(ObfuscatedFileUtilTest, - MigrationBackFromIsolated); + friend class content::ObfuscatedFileUtilTest; // Helper method to create an obfuscated file util for regular // (temporary, persistent) file systems. Used only for testing. diff --git a/webkit/browser/fileapi/plugin_private_file_system_backend.h b/webkit/browser/fileapi/plugin_private_file_system_backend.h index 7f64aa2..8e3f356 100644 --- a/webkit/browser/fileapi/plugin_private_file_system_backend.h +++ b/webkit/browser/fileapi/plugin_private_file_system_backend.h @@ -18,6 +18,10 @@ namespace base { class SequencedTaskRunner; } +namespace content { +class PluginPrivateFileSystemBackendTest; +} + namespace quota { class SpecialStoragePolicy; } @@ -122,7 +126,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT PluginPrivateFileSystemBackend FileSystemType type) const OVERRIDE; private: - friend class PluginPrivateFileSystemBackendTest; + friend class content::PluginPrivateFileSystemBackendTest; ObfuscatedFileUtil* obfuscated_file_util(); const base::FilePath& base_path() const { return base_path_; } diff --git a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h b/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h index 7e326b2..9595cda 100644 --- a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h +++ b/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h @@ -26,6 +26,11 @@ namespace base { class SequencedTaskRunner; } +namespace content { +class SandboxFileSystemBackendDelegateTest; +class SandboxFileSystemTestHelper; +} + namespace quota { class QuotaManagerProxy; class SpecialStoragePolicy; @@ -46,7 +51,6 @@ class FileSystemUsageCache; class ObfuscatedFileUtil; class QuotaReservationManager; class SandboxFileSystemBackend; -class SandboxFileSystemTestHelper; class SandboxQuotaObserver; // Delegate implementation of the some methods in Sandbox/SyncFileSystemBackend. @@ -190,10 +194,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackendDelegate FileSystemFileUtil* sync_file_util(); private: - friend class SandboxQuotaObserver; - friend class SandboxFileSystemTestHelper; friend class QuotaBackendImpl; - FRIEND_TEST_ALL_PREFIXES(SandboxFileSystemBackendDelegateTest, IsAccessValid); + friend class SandboxQuotaObserver; + friend class content::SandboxFileSystemBackendDelegateTest; + friend class content::SandboxFileSystemTestHelper; // Performs API-specific validity checks on the given path |url|. // Returns true if access to |url| is valid in this filesystem. |