Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: webkit/fileapi/local_file_system_operation_unittest.cc

Issue 12051010: (For-try) Divide recursive Copy/Move into multiple async tasks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test fix Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/fileapi/local_file_system_operation_unittest.cc
diff --git a/webkit/fileapi/local_file_system_operation_unittest.cc b/webkit/fileapi/local_file_system_operation_unittest.cc
index 9aab4d6bb37acd72987257f444fa1afa6cd7391d..389de6baf8c966fa3cd1a6ef94408eeecebd0276 100644
--- a/webkit/fileapi/local_file_system_operation_unittest.cc
+++ b/webkit/fileapi/local_file_system_operation_unittest.cc
@@ -686,7 +686,9 @@ TEST_F(LocalFileSystemOperationTest, TestCopySuccessSrcDirRecursive) {
EXPECT_TRUE(FileExists(dest_dir_path.Append(
VirtualPath::BaseName(child_dir_path)).Append(
VirtualPath::BaseName(grandchild_file_path))));
- EXPECT_EQ(1, quota_manager_proxy()->notify_storage_accessed_count());
+
+ // For recursive copy we may record multiple read access.
+ EXPECT_GE(quota_manager_proxy()->notify_storage_accessed_count(), 1);
EXPECT_EQ(2, change_observer()->get_and_reset_create_directory_count());
EXPECT_EQ(1, change_observer()->get_and_reset_remove_directory_count());
@@ -1047,9 +1049,6 @@ TEST_F(LocalFileSystemOperationTest, TestRemoveSuccess) {
EXPECT_EQ(base::PLATFORM_FILE_OK, status());
EXPECT_FALSE(DirectoryExists(parent_dir_path));
- // Remove is not a 'read' access.
- EXPECT_EQ(0, quota_manager_proxy()->notify_storage_accessed_count());
-
EXPECT_EQ(2, change_observer()->get_and_reset_remove_directory_count());
EXPECT_EQ(1, change_observer()->get_and_reset_remove_file_count());
EXPECT_TRUE(change_observer()->HasNoChange());

Powered by Google App Engine
This is Rietveld 408576698