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

trunk/src/chrome/common/extensions/unpacker.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/common/extensions/unpacker.h"
 
 #include <set>
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/rtl.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/scoped_handle.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/i18n/default_locale_handler.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 100 matching lines @@
   }
 
   return static_cast<DictionaryValue*>(root.release());
 }
 
 bool Unpacker::ReadAllMessageCatalogs(const std::string& default_locale) {
   base::FilePath locales_path =
     temp_install_dir_.Append(kLocaleFolder);
 
   // Not all folders under _locales have to be valid locales.
-  base::FileEnumerator locales(locales_path,
-                               false,
-                               base::FileEnumerator::DIRECTORIES);
+  file_util::FileEnumerator locales(locales_path,
+                                    false,
+                                    file_util::FileEnumerator::DIRECTORIES);
 
   std::set<std::string> all_locales;
   extension_l10n_util::GetAllLocales(&all_locales);
   base::FilePath locale_path;
   while (!(locale_path = locales.Next()).empty()) {
     if (extension_l10n_util::ShouldSkipValidation(locales_path, locale_path,
                                                   all_locales))
       continue;
 
     base::FilePath messages_path = locale_path.Append(kMessagesFilename);
@@ skipping 192 matching lines @@
 
 void Unpacker::SetError(const std::string &error) {
   SetUTF16Error(UTF8ToUTF16(error));
 }
 
 void Unpacker::SetUTF16Error(const string16 &error) {
   error_message_ = error;
 }
 
 }  // namespace extensions