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

trunk/src/chrome/common/extensions/api/i18n/default_locale_handler.cc

 // Copyright (c) 2013 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/common/extensions/api/i18n/default_locale_handler.h"
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/manifest.h"
 #include "extensions/common/constants.h"
 #include "grit/generated_resources.h"
@@ skipping 46 matching lines @@
   if (default_locale.empty() && path_exists) {
     *error = l10n_util::GetStringUTF8(
         IDS_EXTENSION_LOCALES_NO_DEFAULT_LOCALE_SPECIFIED);
     return false;
   } else if (!default_locale.empty() && !path_exists) {
     *error = errors::kLocalesTreeMissing;
     return false;
   }
 
   // Treat all folders under _locales as valid locales.
-  base::FileEnumerator locales(path, false, base::FileEnumerator::DIRECTORIES);
+  file_util::FileEnumerator locales(path,
+                                    false,
+                                    file_util::FileEnumerator::DIRECTORIES);
 
   std::set<std::string> all_locales;
   extension_l10n_util::GetAllLocales(&all_locales);
   const base::FilePath default_locale_path = path.AppendASCII(default_locale);
   bool has_default_locale_message_file = false;
 
   base::FilePath locale_path;
   while (!(locale_path = locales.Next()).empty()) {
     if (extension_l10n_util::ShouldSkipValidation(path, locale_path,
                                                   all_locales))
@@ skipping 24 matching lines @@
 bool DefaultLocaleHandler::AlwaysValidateForType(Manifest::Type type) const {
   // Required to validate _locales directory; see Validate.
   return true;
 }
 
 const std::vector<std::string> DefaultLocaleHandler::Keys() const {
   return SingleKey(keys::kDefaultLocale);
 }
 
 }  // namespace extensions