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

trunk/src/chrome/common/extensions/unpacker.cc

Index: trunk/src/chrome/common/extensions/unpacker.cc
===================================================================
--- trunk/src/chrome/common/extensions/unpacker.cc	(revision 198849)
+++ trunk/src/chrome/common/extensions/unpacker.cc	(working copy)
@@ -7,7 +7,6 @@
 #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"
@@ -128,9 +127,9 @@
     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);