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

trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc

Index: trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc	(revision 198849)
+++ trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc	(working copy)
@@ -10,7 +10,6 @@
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ -886,8 +885,8 @@
     base::FilePath wallpaper_dir;
     CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS, &wallpaper_dir));
     if (file_util::DirectoryExists(wallpaper_dir)) {
-      base::FileEnumerator files(wallpaper_dir, false,
-                                 base::FileEnumerator::FILES);
+      file_util::FileEnumerator files(wallpaper_dir, false,
+                                      file_util::FileEnumerator::FILES);
       for (base::FilePath current = files.Next(); !current.empty();
            current = files.Next()) {
         std::string file_name = current.BaseName().RemoveExtension().value();
@@ -900,8 +899,8 @@
     base::FilePath custom_thumbnails_dir = chromeos::WallpaperManager::Get()->
         GetCustomWallpaperPath(chromeos::kThumbnailWallpaperSubDir, email, "");
     if (file_util::DirectoryExists(custom_thumbnails_dir)) {
-      base::FileEnumerator files(custom_thumbnails_dir, false,
-                                 base::FileEnumerator::FILES);
+      file_util::FileEnumerator files(custom_thumbnails_dir, false,
+                                      file_util::FileEnumerator::FILES);
       std::set<std::string> file_name_set;
       for (base::FilePath current = files.Next(); !current.empty();
            current = files.Next()) {