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

trunk/src/chrome/browser/importer/firefox2_importer.cc

Index: trunk/src/chrome/browser/importer/firefox2_importer.cc
===================================================================
--- trunk/src/chrome/browser/importer/firefox2_importer.cc	(revision 198849)
+++ trunk/src/chrome/browser/importer/firefox2_importer.cc	(working copy)
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/message_loop.h"
@@ -625,9 +624,9 @@
 void Firefox2Importer::FindXMLFilesInDir(
     const base::FilePath& dir,
     std::vector<base::FilePath>* xml_files) {
-  base::FileEnumerator file_enum(dir, false,
-                                 base::FileEnumerator::FILES,
-                                 FILE_PATH_LITERAL("*.xml"));
+  file_util::FileEnumerator file_enum(dir, false,
+                                      file_util::FileEnumerator::FILES,
+                                      FILE_PATH_LITERAL("*.xml"));
   base::FilePath file(file_enum.Next());
   while (!file.empty()) {
     xml_files->push_back(file);