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

trunk/src/chrome/browser/history/text_database_manager.cc

Index: trunk/src/chrome/browser/history/text_database_manager.cc
===================================================================
--- trunk/src/chrome/browser/history/text_database_manager.cc	(revision 198849)
+++ trunk/src/chrome/browser/history/text_database_manager.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/metrics/histogram.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -161,8 +160,8 @@
   // Find files on disk matching our pattern so we can quickly test for them.
   base::FilePath::StringType filepattern(TextDatabase::file_base());
   filepattern.append(FILE_PATH_LITERAL("*"));
-  base::FileEnumerator enumerator(
-      dir_, false, base::FileEnumerator::FILES, filepattern);
+  file_util::FileEnumerator enumerator(
+      dir_, false, file_util::FileEnumerator::FILES, filepattern);
   base::FilePath cur_file;
   while (!(cur_file = enumerator.Next()).empty()) {
     // Convert to the number representing this file.