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

trunk/src/chrome/browser/chromeos/drive/file_cache.cc

Index: trunk/src/chrome/browser/chromeos/drive/file_cache.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/drive/file_cache.cc	(revision 198849)
+++ trunk/src/chrome/browser/chromeos/drive/file_cache.cc	(working copy)
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ -63,8 +62,10 @@
 // Do not remove recursively as we don't want to touch <gcache>/tmp/downloads,
 // which is used for user initiated downloads like "Save As"
 void RemoveAllFiles(const base::FilePath& directory) {
-  base::FileEnumerator enumerator(directory, false /* recursive */,
-                                  base::FileEnumerator::FILES);
+  using file_util::FileEnumerator;
+
+  FileEnumerator enumerator(directory, false /* recursive */,
+                            FileEnumerator::FILES);
   for (base::FilePath file_path = enumerator.Next(); !file_path.empty();
        file_path = enumerator.Next()) {
     DVLOG(1) << "Removing " << file_path.value();
@@ -130,9 +131,11 @@
   // base name of |path_to_delete_pattern|.
   // If a file is not |path_to_keep|, delete it.
   bool success = true;
-  base::FileEnumerator enumerator(path_to_delete_pattern.DirName(),
+  file_util::FileEnumerator enumerator(
+      path_to_delete_pattern.DirName(),
       false,  // not recursive
-      base::FileEnumerator::FILES | base::FileEnumerator::SHOW_SYM_LINKS,
+      file_util::FileEnumerator::FILES |
+      file_util::FileEnumerator::SHOW_SYM_LINKS,
       path_to_delete_pattern.BaseName().value());
   for (base::FilePath current = enumerator.Next(); !current.empty();
        current = enumerator.Next()) {