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

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

Index: trunk/src/chrome/browser/history/expire_history_backend.cc
===================================================================
--- trunk/src/chrome/browser/history/expire_history_backend.cc	(revision 198849)
+++ trunk/src/chrome/browser/history/expire_history_backend.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
@@ -755,8 +754,8 @@
   base::FilePath::StringType history_index_files_pattern =
       TextDatabase::file_base();
   history_index_files_pattern.append(FILE_PATH_LITERAL("*"));
-  base::FileEnumerator file_enumerator(
-      text_db_->GetDir(), false, base::FileEnumerator::FILES,
+  file_util::FileEnumerator file_enumerator(
+      text_db_->GetDir(), false, file_util::FileEnumerator::FILES,
       history_index_files_pattern);
   for (base::FilePath file = file_enumerator.Next(); !file.empty();
        file = file_enumerator.Next()) {
Property changes on: trunk/src/chrome/browser/history/expire_history_backend.cc
___________________________________________________________________
Deleted: svn:mergeinfo