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

trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.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/browser/chromeos/extensions/wallpaper_private_api.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #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"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user.h"
@@ skipping 855 matching lines @@
 void WallpaperPrivateGetOfflineWallpaperListFunction::GetList(
     const std::string& email,
     const std::string& source) {
   DCHECK(BrowserThread::GetBlockingPool()->IsRunningSequenceOnCurrentThread(
       sequence_token_));
   std::vector<std::string> file_list;
   if (source == kOnlineSource) {
     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();
         // Do not add file name of small resolution wallpaper to the list.
         if (!EndsWith(file_name, chromeos::kSmallWallpaperSuffix, true))
           file_list.push_back(current.BaseName().value());
       }
     }
   } else {
     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()) {
         file_name_set.insert(current.BaseName().value());
       }
       for (std::set<std::string>::reverse_iterator rit = file_name_set.rbegin();
            rit != file_name_set.rend(); ++rit) {
         file_list.push_back(*rit);
       }
     }
   }
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete,
                  this, file_list));
 }
 
 void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete(
     const std::vector<std::string>& file_list) {
   ListValue* results = new ListValue();
   results->AppendStrings(file_list);
   SetResult(results);
   SendResponse(true);
 }