Cleanup: Move more recursive operation logic from FileUtilHelper to FileUtil

webkit/fileapi/isolated_file_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 32 matching lines @@
   FILE_PATH_LITERAL("b/c"),
   FILE_PATH_LITERAL("etc"),
 };
 
 FilePath GetTopLevelPath(const FilePath& path) {
   std::vector<FilePath::StringType> components;
   path.GetComponents(&components);
   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
 // IsolatedFileUtil.
 class IsolatedFileUtilTest : public testing::Test {
  public:
   IsolatedFileUtilTest()
       : other_file_util_helper_(GURL("http://foo/"), kFileSystemTypeTest) {}
 
   void SetUp() {
@@ skipping 126 matching lines @@
                                          true /* recursive */);
 
     while (!(current = file_enum2->Next()).empty()) {
       FilePath relative;
       root_path2.AppendRelativePath(current, &relative);
       FileSystemURL url1 = root1.WithPath(root_path1.Append(relative));
       FileSystemURL url2 = root2.WithPath(root_path2.Append(relative));
       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());
       VerifyFilesHaveSameContent(file_util1, file_util2, url1, url2);
     }
   }
 
   scoped_ptr<FileSystemOperationContext> GetOperationContext() {
     return make_scoped_ptr(
         new FileSystemOperationContext(file_system_context())).Pass();
@@ skipping 299 matching lines @@
     EXPECT_EQ(base::PLATFORM_FILE_OK,
               file_util()->Truncate(GetOperationContext().get(), url, 999));
     ASSERT_EQ(base::PLATFORM_FILE_OK,
               file_util()->GetFileInfo(GetOperationContext().get(), url,
                                        &info, &platform_path));
     EXPECT_EQ(999, info.size);
   }
 }
 
 }  // namespace fileapi