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

Unified Diff: webkit/fileapi/isolated_file_util_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/isolated_file_util_unittest.cc
diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc
index 9a5b48e6215a63b8acb57e5ae653225361921b7e..2ab7e71ef302d8f43a603314821432282dcae4c3 100644
--- a/webkit/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/fileapi/isolated_file_util_unittest.cc
@@ -50,6 +50,14 @@ FilePath GetTopLevelPath(const FilePath& path) {
return FilePath(components[0]);
}
+bool IsDirectoryEmpty(FileSystemOperationContext* context,
+ FileSystemFileUtil* file_util,
+ const FileSystemURL& url) {
+ scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> file_enum =
+ file_util->CreateFileEnumerator(context, url, false /* recursive */);
+ return file_enum->Next().empty();
+}
+
} // namespace
// TODO(kinuko): we should have separate tests for DraggedFileUtil and
@@ -193,8 +201,8 @@ class IsolatedFileUtilTest : public testing::Test {
if (file_enum2->IsDirectory()) {
FileSystemOperationContext context1(file_system_context());
FileSystemOperationContext context2(file_system_context());
- EXPECT_EQ(file_util1->IsDirectoryEmpty(&context1, url1),
- file_util2->IsDirectoryEmpty(&context2, url2));
+ EXPECT_EQ(IsDirectoryEmpty(&context1, file_util1, url1),
+ IsDirectoryEmpty(&context2, file_util2, url2));
continue;
}
EXPECT_TRUE(file_set1.find(relative) != file_set1.end());

Powered by Google App Engine
This is Rietveld 408576698