Move FileEnumerator to its own file, do some refactoring.

chrome/browser/history/expire_history_backend.cc

Index: chrome/browser/history/expire_history_backend.cc
diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc
index 51cfaea5783ea72bf6bc471ef544b54624a15788..d21cb0ad41ffd4ab54091a7389be6c8631d030e1 100644
--- a/chrome/browser/history/expire_history_backend.cc
+++ b/chrome/browser/history/expire_history_backend.cc
@@ -11,6 +11,7 @@
 #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"
@@ -754,8 +755,8 @@ void ExpireHistoryBackend::DoExpireHistoryIndexFiles() {
   base::FilePath::StringType history_index_files_pattern =
       TextDatabase::file_base();
   history_index_files_pattern.append(FILE_PATH_LITERAL("*"));
-  file_util::FileEnumerator file_enumerator(
-      text_db_->GetDir(), false, file_util::FileEnumerator::FILES,
+  base::FileEnumerator file_enumerator(
+      text_db_->GetDir(), false, base::FileEnumerator::FILES,
       history_index_files_pattern);
   for (base::FilePath file = file_enumerator.Next(); !file.empty();
        file = file_enumerator.Next()) {