Move FileEnumerator to its own file, do some refactoring.

chrome/browser/extensions/external_pref_loader.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/extensions/external_pref_loader.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 base::FilePath::CharType kExternalExtensionJson[] =
     FILE_PATH_LITERAL("external_extensions.json");
 
 std::set<base::FilePath> GetPrefsCandidateFilesFromFolder(
       const base::FilePath& external_extension_search_path) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   std::set<base::FilePath> external_extension_paths;
 
   if (!file_util::PathExists(external_extension_search_path)) {
     // Does not have to exist.
     return external_extension_paths;
   }
 
-  file_util::FileEnumerator json_files(
+  base::FileEnumerator json_files(
       external_extension_search_path,
       false,  // Recursive.
-      file_util::FileEnumerator::FILES);
+      base::FileEnumerator::FILES);
 #if defined(OS_WIN)
   base::FilePath::StringType extension = UTF8ToWide(std::string(".json"));
 #elif defined(OS_POSIX)
   base::FilePath::StringType extension(".json");
 #endif
   do {
     base::FilePath file = json_files.Next();
     if (file.BaseName().value() == kExternalExtensionJson)
       continue;  // Already taken care of elsewhere.
     if (file.empty())
@@ skipping 193 matching lines @@
   LoadFinished();
 }
 
 ExternalTestingLoader::~ExternalTestingLoader() {}
 
 const base::FilePath ExternalTestingLoader::GetBaseCrxFilePath() {
   return fake_base_path_;
 }
 
 }  // extensions