diff options
3 files changed, 14 insertions, 10 deletions
diff --git a/content/browser/fileapi/file_system_operation_impl_unittest.cc b/content/browser/fileapi/file_system_operation_impl_unittest.cc index afbe664..1b6c5c4 100644 --- a/content/browser/fileapi/file_system_operation_impl_unittest.cc +++ b/content/browser/fileapi/file_system_operation_impl_unittest.cc @@ -277,7 +277,7 @@ class FileSystemOperationImplTest } private: - base::MessageLoop message_loop_; + base::MessageLoopForIO message_loop_; scoped_refptr<QuotaManager> quota_manager_; scoped_refptr<QuotaManagerProxy> quota_manager_proxy_; @@ -553,7 +553,11 @@ TEST_F(FileSystemOperationImplTest, TestCopyFailureSrcFileExistsDestDir) { FileSystemOperationRunner::CopyProgressCallback(), RecordStatusCallback()); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(base::File::FILE_ERROR_INVALID_OPERATION, status()); + EXPECT_EQ(3, quota_manager_proxy()->notify_storage_accessed_count()); + + EXPECT_EQ(1, change_observer()->get_and_reset_create_directory_count()); + EXPECT_EQ(1, change_observer()->get_and_reset_remove_directory_count()); + EXPECT_EQ(base::File::FILE_ERROR_NOT_A_DIRECTORY, status()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -604,9 +608,8 @@ TEST_F(FileSystemOperationImplTest, TestCopySuccessSrcFileAndOverwrite) { base::RunLoop().RunUntilIdle(); EXPECT_EQ(base::File::FILE_OK, status()); EXPECT_TRUE(FileExists("dest")); - EXPECT_EQ(2, quota_manager_proxy()->notify_storage_accessed_count()); + EXPECT_EQ(4, quota_manager_proxy()->notify_storage_accessed_count()); - EXPECT_EQ(1, change_observer()->get_and_reset_modify_file_count()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -620,9 +623,9 @@ TEST_F(FileSystemOperationImplTest, TestCopySuccessSrcFileAndNew) { base::RunLoop().RunUntilIdle(); EXPECT_EQ(base::File::FILE_OK, status()); EXPECT_TRUE(FileExists("new")); - EXPECT_EQ(2, quota_manager_proxy()->notify_storage_accessed_count()); + EXPECT_EQ(4, quota_manager_proxy()->notify_storage_accessed_count()); - EXPECT_EQ(1, change_observer()->get_and_reset_create_file_from_count()); + EXPECT_EQ(1, change_observer()->get_and_reset_create_file_count()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -642,8 +645,8 @@ TEST_F(FileSystemOperationImplTest, TestCopySuccessSrcDirAndOverwrite) { EXPECT_FALSE(DirectoryExists("dest/src")); EXPECT_GE(quota_manager_proxy()->notify_storage_accessed_count(), 3); - EXPECT_EQ(1, change_observer()->get_and_reset_remove_directory_count()); EXPECT_EQ(1, change_observer()->get_and_reset_create_directory_count()); + EXPECT_EQ(1, change_observer()->get_and_reset_remove_directory_count()); EXPECT_TRUE(change_observer()->HasNoChange()); } @@ -684,9 +687,9 @@ TEST_F(FileSystemOperationImplTest, TestCopySuccessSrcDirRecursive) { // For recursive copy we may record multiple read access. EXPECT_GE(quota_manager_proxy()->notify_storage_accessed_count(), 1); + EXPECT_EQ(1, change_observer()->get_and_reset_create_file_count()); EXPECT_EQ(2, change_observer()->get_and_reset_create_directory_count()); EXPECT_EQ(1, change_observer()->get_and_reset_remove_directory_count()); - EXPECT_EQ(1, change_observer()->get_and_reset_create_file_from_count()); EXPECT_TRUE(change_observer()->HasNoChange()); } diff --git a/content/browser/fileapi/obfuscated_file_util_unittest.cc b/content/browser/fileapi/obfuscated_file_util_unittest.cc index 0c41e8a..0cbda88 100644 --- a/content/browser/fileapi/obfuscated_file_util_unittest.cc +++ b/content/browser/fileapi/obfuscated_file_util_unittest.cc @@ -144,7 +144,8 @@ bool HasFileSystemType(ObfuscatedFileUtil::AbstractOriginEnumerator* enumerator, class ObfuscatedFileUtilTest : public testing::Test { public: ObfuscatedFileUtilTest() - : origin_(GURL("http://www.example.com")), + : message_loop_(base::MessageLoop::TYPE_IO), + origin_(GURL("http://www.example.com")), type_(storage::kFileSystemTypeTemporary), weak_factory_(this), sandbox_file_system_(origin_, type_), diff --git a/webkit/browser/fileapi/sandbox_file_system_backend.cc b/webkit/browser/fileapi/sandbox_file_system_backend.cc index 4aa9595..8ab5de1 100644 --- a/webkit/browser/fileapi/sandbox_file_system_backend.cc +++ b/webkit/browser/fileapi/sandbox_file_system_backend.cc @@ -128,7 +128,7 @@ bool SandboxFileSystemBackend::SupportsStreaming( bool SandboxFileSystemBackend::HasInplaceCopyImplementation( storage::FileSystemType type) const { - return true; + return false; } scoped_ptr<storage::FileStreamReader> |