Move FileEnumerator to its own file, do some refactoring.

chrome/browser/chromeos/drive/file_cache_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 "chrome/browser/chromeos/drive/file_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/mock_file_cache_observer.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "content/public/test/test_browser_thread.h"
@@ skipping 134 matching lines @@
     cache_->RemoveOnUIThread(
         resource_id,
         google_apis::test_util::CreateCopyResultCallback(&error));
     google_apis::test_util::RunBlockingPoolTask();
     VerifyRemoveFromCache(error, resource_id, "");
   }
 
   // Returns number of files matching to |path_pattern|.
   int CountFilesWithPathPattern(const base::FilePath& path_pattern) {
     int result = 0;
-    file_util::FileEnumerator enumerator(
+    base::FileEnumerator enumerator(
         path_pattern.DirName(), false /* not recursive*/,
-        file_util::FileEnumerator::FILES,
+        base::FileEnumerator::FILES,
         path_pattern.BaseName().value());
     for (base::FilePath current = enumerator.Next(); !current.empty();
          current = enumerator.Next())
       ++result;
     return result;
   }
 
   void VerifyRemoveFromCache(FileError error,
                              const std::string& resource_id,
                              const std::string& md5) {
@@ skipping 296 matching lines @@
   // Returns the number of the cache files with name <resource_id>, and Confirm
   // that they have the <md5>. This should return 1 or 0.
   size_t CountCacheFiles(const std::string& resource_id,
                          const std::string& md5) {
     base::FilePath path = GetCacheFilePath(
         resource_id, "*",
         (test_util::ToCacheEntry(expected_cache_state_).is_pinned() ?
          FileCache::CACHE_TYPE_PERSISTENT :
          FileCache::CACHE_TYPE_TMP),
         FileCache::CACHED_FILE_FROM_SERVER);
-    file_util::FileEnumerator enumerator(path.DirName(), false,
-                                         file_util::FileEnumerator::FILES,
-                                         path.BaseName().value());
+    base::FileEnumerator enumerator(path.DirName(), false,
+                                    base::FileEnumerator::FILES,
+                                    path.BaseName().value());
     size_t num_files_found = 0;
     for (base::FilePath current = enumerator.Next(); !current.empty();
          current = enumerator.Next()) {
       ++num_files_found;
       EXPECT_EQ(util::EscapeCacheFileName(resource_id) +
                 base::FilePath::kExtensionSeparator +
                 util::EscapeCacheFileName(md5),
                 current.BaseName().value());
     }
     return num_files_found;
@@ skipping 811 matching lines @@
   EXPECT_TRUE(cache_->GetCacheEntry(resource_id_pinned, md5_pinned, &entry));
   EXPECT_TRUE(file_util::PathExists(pinned_path));
 
   // Returns false when disk space cannot be freed.
   fake_free_disk_space_getter_->set_default_value(0);
   EXPECT_FALSE(cache_->FreeDiskSpaceIfNeededFor(kNeededBytes));
 }
 
 }  // namespace internal
 }  // namespace drive