Move FileEnumerator to its own file, do some refactoring.

chrome/browser/importer/firefox2_importer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/firefox2_importer.h"
 
 #include <string>
 #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"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_types.h"
@@ skipping 596 matching lines @@
       &text16, 0, ASCIIToUTF16("&quot;"), ASCIIToUTF16("\""));
   ReplaceSubstringsAfterOffset(
       &text16, 0, ASCIIToUTF16("&#39;"), ASCIIToUTF16("\'"));
   text->assign(text16);
 }
 
 // static
 void Firefox2Importer::FindXMLFilesInDir(
     const base::FilePath& dir,
     std::vector<base::FilePath>* xml_files) {
-  file_util::FileEnumerator file_enum(dir, false,
-                                      file_util::FileEnumerator::FILES,
-                                      FILE_PATH_LITERAL("*.xml"));
+  base::FileEnumerator file_enum(dir, false,
+                                 base::FileEnumerator::FILES,
+                                 FILE_PATH_LITERAL("*.xml"));
   base::FilePath file(file_enum.Next());
   while (!file.empty()) {
     xml_files->push_back(file);
     file = file_enum.Next();
   }
 }
 
 // static
 void Firefox2Importer::DataURLToFaviconUsage(
     const GURL& link_url,
@@ skipping 17 matching lines @@
 
   // We need to make up a URL for the favicon. We use a version of the page's
   // URL so that we can be sure it will not collide.
   usage.favicon_url = GURL(std::string("made-up-favicon:") + link_url.spec());
 
   // We only have one URL per favicon for Firefox 2 bookmarks.
   usage.urls.insert(link_url);
 
   favicons->push_back(usage);
 }