Revert 198820 "Move FileEnumerator to its own file, do some refa..."

trunk/src/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 257 matching lines @@
     paths_to_verify.push_back(  // Index 1: CACHE_TYPE_PERSISTENT.
         PathToVerify(cache_->GetCacheFilePath(resource_id, "*",
                      FileCache::CACHE_TYPE_PERSISTENT,
                      FileCache::CACHED_FILE_FROM_SERVER), base::FilePath()));
     paths_to_verify.push_back(  // Index 2: CACHE_TYPE_OUTGOING.
         PathToVerify(cache_->GetCacheFilePath(resource_id, "",
                      FileCache::CACHE_TYPE_OUTGOING,
                      FileCache::CACHED_FILE_FROM_SERVER), base::FilePath()));
     if (!cache_entry_found) {
       for (size_t i = 0; i < paths_to_verify.size(); ++i) {
-        base::FileEnumerator enumerator(
+        file_util::FileEnumerator enumerator(
             paths_to_verify[i].path_to_scan.DirName(), false /* not recursive*/,
-            base::FileEnumerator::FILES | base::FileEnumerator::SHOW_SYM_LINKS,
+            file_util::FileEnumerator::FILES |
+            file_util::FileEnumerator::SHOW_SYM_LINKS,
             paths_to_verify[i].path_to_scan.BaseName().value());
         EXPECT_TRUE(enumerator.Next().empty());
       }
     } else {
       // Entry is dirty, verify that:
       // - no files with "<resource_id>.*" exist in tmp dir
       // - only 1 "<resource_id>.local" exists in persistent dir
       // - only 1 <resource_id> exists in outgoing dir
       // - if entry is pinned, only 1 <resource_id> exists in pinned dir.
 
       // Change expected_existing_path of CACHE_TYPE_PERSISTENT (index 1).
       paths_to_verify[1].expected_existing_path =
           GetCacheFilePath(resource_id,
                            std::string(),
                            FileCache::CACHE_TYPE_PERSISTENT,
                            FileCache::CACHED_FILE_LOCALLY_MODIFIED);
 
       // Change expected_existing_path of CACHE_TYPE_OUTGOING (index 2).
       paths_to_verify[2].expected_existing_path =
           GetCacheFilePath(resource_id,
                            std::string(),
                            FileCache::CACHE_TYPE_OUTGOING,
                            FileCache::CACHED_FILE_FROM_SERVER);
 
       for (size_t i = 0; i < paths_to_verify.size(); ++i) {
         const struct PathToVerify& verify = paths_to_verify[i];
-        base::FileEnumerator enumerator(
+        file_util::FileEnumerator enumerator(
             verify.path_to_scan.DirName(), false /* not recursive */,
-            base::FileEnumerator::FILES | base::FileEnumerator::SHOW_SYM_LINKS,
+            file_util::FileEnumerator::FILES |
+            file_util::FileEnumerator::SHOW_SYM_LINKS,
             verify.path_to_scan.BaseName().value());
         size_t num_files_found = 0;
         for (base::FilePath current = enumerator.Next(); !current.empty();
              current = enumerator.Next()) {
           ++num_files_found;
           EXPECT_EQ(verify.expected_existing_path, current);
         }
         if (verify.expected_existing_path.empty())
           EXPECT_EQ(0U, num_files_found);
         else
@@ skipping 282 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);
-    base::FileEnumerator enumerator(path.DirName(), false,
-                                    base::FileEnumerator::FILES,
-                                    path.BaseName().value());
+    file_util::FileEnumerator enumerator(path.DirName(), false,
+                                         file_util::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 768 matching lines @@
       google_apis::test_util::GetTestFilePath("chromeos/gdata/empty_feed.json"),
       FILE_ERROR_OK,
       test_util::TEST_CACHE_STATE_PRESENT |
       test_util::TEST_CACHE_STATE_PINNED |
       test_util::TEST_CACHE_STATE_PERSISTENT,
       FileCache::CACHE_TYPE_PERSISTENT);
 }
 
 }  // namespace internal
 }  // namespace drive