summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 05:46:20 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 05:46:20 +0000
commit9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb (patch)
tree0818f910c522fb5bda00cab55412201251db32f7 /chrome/browser
parentad5b14e00b36aab6e2b2d6aba8477a5dd9a11998 (diff)
downloadchromium_src-9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb.zip
chromium_src-9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb.tar.gz
chromium_src-9e66a9b94a40eeeeb52c47c83990b0766e1b7ceb.tar.bz2
Revert 198820 "Move FileEnumerator to its own file, do some refa..."
Broke both windows clobber and official builders' compile with this error: 771>Link: 771> Creating library ..\..\..\build\Release\lib\gcp_portmon64.lib and object ..\..\..\build\Release\lib\gcp_portmon64.exp 771>base.lib(path_service.obj) : fatalerror LNK1112: module machine type 'X86' conflicts with target machine type 'x64' 771> 771>Build FAILED. > Move FileEnumerator to its own file, do some refactoring. > > It creates a class FileInfo to contain the details rather than using a platform-specific typedef. This allows the accessors GetName, GetSize, etc. to be moved directly to this class (previously they were static helpers on the FileEnumerator class) which makes a bunch of code much cleaner. It also gives reasonable getting and initialization which the previous version lacked. > > BUG=175002 > R=rvargas@chromium.org > > Review URL: https://codereview.chromium.org/13165005 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/14824006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc5
-rw-r--r--chrome/browser/chromeos/camera_detector.cc6
-rw-r--r--chrome/browser/chromeos/contacts/contact_database_unittest.cc5
-rw-r--r--chrome/browser/chromeos/drive/file_cache.cc13
-rw-r--r--chrome/browser/chromeos/drive/file_cache_metadata.cc6
-rw-r--r--chrome/browser/chromeos/drive/file_cache_unittest.cc17
-rw-r--r--chrome/browser/chromeos/extensions/wallpaper_private_api.cc9
-rw-r--r--chrome/browser/chromeos/login/wallpaper_manager.cc4
-rw-r--r--chrome/browser/chromeos/policy/app_pack_updater.cc14
-rw-r--r--chrome/browser/component_updater/pepper_flash_component_installer.cc5
-rw-r--r--chrome/browser/component_updater/pnacl/pnacl_component_installer.cc5
-rw-r--r--chrome/browser/component_updater/swiftshader_component_installer.cc5
-rw-r--r--chrome/browser/component_updater/widevine_cdm_component_installer.cc5
-rw-r--r--chrome/browser/extensions/api/developer_private/developer_private_api.cc6
-rw-r--r--chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc8
-rw-r--r--chrome/browser/extensions/api/storage/settings_backend.cc11
-rw-r--r--chrome/browser/extensions/extension_service_unittest.cc5
-rw-r--r--chrome/browser/extensions/external_pref_loader.cc5
-rw-r--r--chrome/browser/extensions/sandboxed_unpacker_unittest.cc7
-rw-r--r--chrome/browser/file_select_helper.cc3
-rw-r--r--chrome/browser/history/expire_history_backend.cc5
-rw-r--r--chrome/browser/history/text_database_manager.cc5
-rw-r--r--chrome/browser/importer/firefox2_importer.cc7
-rw-r--r--chrome/browser/importer/firefox3_importer.cc4
-rw-r--r--chrome/browser/importer/ie_importer.cc5
-rw-r--r--chrome/browser/policy/config_dir_policy_loader.cc9
-rw-r--r--chrome/browser/policy/policy_browsertest.cc10
-rw-r--r--chrome/browser/printing/printing_layout_browsertest.cc5
-rw-r--r--chrome/browser/profiles/profile_manager.cc13
-rw-r--r--chrome/browser/profiles/profile_shortcut_manager_win.cc9
-rw-r--r--chrome/browser/shell_integration_win.cc5
-rw-r--r--chrome/browser/ui/pdf/pdf_browsertest.cc5
-rw-r--r--chrome/browser/ui/webui/chromeos/drive_internals_ui.cc25
-rw-r--r--chrome/browser/ui/webui/feedback_ui.cc6
34 files changed, 126 insertions, 131 deletions
diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
index 5b45199..b123b89 100644
--- a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
@@ -9,7 +9,6 @@
#include "base/bind_helpers.h"
#include "base/callback.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/test/thread_test_helper.h"
@@ -130,10 +129,10 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, DeleteSingleFile) {
BrowserThread::GetBlockingPool()->FlushForTesting();
// Ensure the file has been deleted.
- base::FileEnumerator file_enumerator(
+ file_util::FileEnumerator file_enumerator(
GetLocalStoragePathForTestingProfile(),
false,
- base::FileEnumerator::FILES);
+ file_util::FileEnumerator::FILES);
int num_files = 0;
for (base::FilePath file_path = file_enumerator.Next();
!file_path.empty();
diff --git a/chrome/browser/chromeos/camera_detector.cc b/chrome/browser/chromeos/camera_detector.cc
index 3d5d039..e7fddb9 100644
--- a/chrome/browser/chromeos/camera_detector.cc
+++ b/chrome/browser/chromeos/camera_detector.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/location.h"
#include "base/string_util.h"
#include "base/strings/string_split.h"
@@ -67,9 +66,10 @@ void CameraDetector::OnPresenceCheckDone(const base::Closure& callback,
bool CameraDetector::CheckPresence() {
// We do a quick check using udev database because opening each /dev/videoX
// device may trigger costly device initialization.
- base::FileEnumerator file_enum(
+ using file_util::FileEnumerator;
+ FileEnumerator file_enum(
base::FilePath(kV4LSubsystemDir), false /* not recursive */,
- base::FileEnumerator::FILES | base::FileEnumerator::SHOW_SYM_LINKS);
+ FileEnumerator::FILES | FileEnumerator::SHOW_SYM_LINKS);
for (base::FilePath path = file_enum.Next(); !path.empty();
path = file_enum.Next()) {
std::string v4l_capabilities;
diff --git a/chrome/browser/chromeos/contacts/contact_database_unittest.cc b/chrome/browser/chromeos/contacts/contact_database_unittest.cc
index 959d9eb..c32cad0 100644
--- a/chrome/browser/chromeos/contacts/contact_database_unittest.cc
+++ b/chrome/browser/chromeos/contacts/contact_database_unittest.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
@@ -315,8 +314,8 @@ TEST_F(ContactDatabaseTest, FullAndIncrementalUpdates) {
TEST_F(ContactDatabaseTest, DeleteWhenCorrupt) {
DestroyDatabase();
// Overwrite all of the files in the database with a space character.
- base::FileEnumerator enumerator(
- database_path(), false, base::FileEnumerator::FILES);
+ file_util::FileEnumerator enumerator(
+ database_path(), false, file_util::FileEnumerator::FILES);
for (base::FilePath path = enumerator.Next(); !path.empty();
path = enumerator.Next()) {
file_util::WriteFile(path, " ", 1);
diff --git a/chrome/browser/chromeos/drive/file_cache.cc b/chrome/browser/chromeos/drive/file_cache.cc
index dbbc40e..6e312eb 100644
--- a/chrome/browser/chromeos/drive/file_cache.cc
+++ b/chrome/browser/chromeos/drive/file_cache.cc
@@ -7,7 +7,6 @@
#include <vector>
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
@@ -63,8 +62,10 @@ bool InitCachePaths(const std::vector<base::FilePath>& cache_paths) {
// Do not remove recursively as we don't want to touch <gcache>/tmp/downloads,
// which is used for user initiated downloads like "Save As"
void RemoveAllFiles(const base::FilePath& directory) {
- base::FileEnumerator enumerator(directory, false /* recursive */,
- base::FileEnumerator::FILES);
+ using file_util::FileEnumerator;
+
+ FileEnumerator enumerator(directory, false /* recursive */,
+ FileEnumerator::FILES);
for (base::FilePath file_path = enumerator.Next(); !file_path.empty();
file_path = enumerator.Next()) {
DVLOG(1) << "Removing " << file_path.value();
@@ -130,9 +131,11 @@ void DeleteFilesSelectively(const base::FilePath& path_to_delete_pattern,
// base name of |path_to_delete_pattern|.
// If a file is not |path_to_keep|, delete it.
bool success = true;
- base::FileEnumerator enumerator(path_to_delete_pattern.DirName(),
+ file_util::FileEnumerator enumerator(
+ path_to_delete_pattern.DirName(),
false, // not recursive
- base::FileEnumerator::FILES | base::FileEnumerator::SHOW_SYM_LINKS,
+ file_util::FileEnumerator::FILES |
+ file_util::FileEnumerator::SHOW_SYM_LINKS,
path_to_delete_pattern.BaseName().value());
for (base::FilePath current = enumerator.Next(); !current.empty();
current = enumerator.Next()) {
diff --git a/chrome/browser/chromeos/drive/file_cache_metadata.cc b/chrome/browser/chromeos/drive/file_cache_metadata.cc
index 244df4b..ae40aed 100644
--- a/chrome/browser/chromeos/drive/file_cache_metadata.cc
+++ b/chrome/browser/chromeos/drive/file_cache_metadata.cc
@@ -6,7 +6,6 @@
#include "base/callback.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/metrics/histogram.h"
#include "base/sequenced_task_runner.h"
#include "chrome/browser/chromeos/drive/drive.pb.h"
@@ -71,10 +70,11 @@ void ScanCacheDirectory(
DCHECK(cache_map);
DCHECK(processed_file_map);
- base::FileEnumerator enumerator(
+ file_util::FileEnumerator enumerator(
cache_paths[sub_dir_type],
false, // not recursive
- base::FileEnumerator::FILES | base::FileEnumerator::SHOW_SYM_LINKS,
+ file_util::FileEnumerator::FILES |
+ file_util::FileEnumerator::SHOW_SYM_LINKS,
util::kWildCard);
for (base::FilePath current = enumerator.Next(); !current.empty();
current = enumerator.Next()) {
diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc
index 0b943e0..23de08e 100644
--- a/chrome/browser/chromeos/drive/file_cache_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc
@@ -8,7 +8,6 @@
#include <vector>
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop.h"
#include "base/threading/sequenced_worker_pool.h"
@@ -286,9 +285,10 @@ class FileCacheTest : public testing::Test {
FileCache::CACHED_FILE_FROM_SERVER), base::FilePath()));
if (!cache_entry_found) {
for (size_t i = 0; i < paths_to_verify.size(); ++i) {
- base::FileEnumerator enumerator(
+ file_util::FileEnumerator enumerator(
paths_to_verify[i].path_to_scan.DirName(), false /* not recursive*/,
- base::FileEnumerator::FILES | base::FileEnumerator::SHOW_SYM_LINKS,
+ file_util::FileEnumerator::FILES |
+ file_util::FileEnumerator::SHOW_SYM_LINKS,
paths_to_verify[i].path_to_scan.BaseName().value());
EXPECT_TRUE(enumerator.Next().empty());
}
@@ -315,9 +315,10 @@ class FileCacheTest : public testing::Test {
for (size_t i = 0; i < paths_to_verify.size(); ++i) {
const struct PathToVerify& verify = paths_to_verify[i];
- base::FileEnumerator enumerator(
+ file_util::FileEnumerator enumerator(
verify.path_to_scan.DirName(), false /* not recursive */,
- base::FileEnumerator::FILES | base::FileEnumerator::SHOW_SYM_LINKS,
+ file_util::FileEnumerator::FILES |
+ file_util::FileEnumerator::SHOW_SYM_LINKS,
verify.path_to_scan.BaseName().value());
size_t num_files_found = 0;
for (base::FilePath current = enumerator.Next(); !current.empty();
@@ -620,9 +621,9 @@ class FileCacheTest : public testing::Test {
FileCache::CACHE_TYPE_PERSISTENT :
FileCache::CACHE_TYPE_TMP),
FileCache::CACHED_FILE_FROM_SERVER);
- base::FileEnumerator enumerator(path.DirName(), false,
- base::FileEnumerator::FILES,
- path.BaseName().value());
+ file_util::FileEnumerator enumerator(path.DirName(), false,
+ file_util::FileEnumerator::FILES,
+ path.BaseName().value());
size_t num_files_found = 0;
for (base::FilePath current = enumerator.Next(); !current.empty();
current = enumerator.Next()) {
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index d2a855e..ac32448 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -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 @@ void WallpaperPrivateGetOfflineWallpaperListFunction::GetList(
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 @@ void WallpaperPrivateGetOfflineWallpaperListFunction::GetList(
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()) {
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.cc b/chrome/browser/chromeos/login/wallpaper_manager.cc
index 95adc86..0613513 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager.cc
@@ -9,7 +9,6 @@
#include "ash/shell.h"
#include "base/command_line.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
@@ -685,7 +684,8 @@ void WallpaperManager::ClearObsoleteWallpaperPrefs() {
void WallpaperManager::DeleteAllExcept(const base::FilePath& path) {
base::FilePath dir = path.DirName();
if (file_util::DirectoryExists(dir)) {
- base::FileEnumerator files(dir, false, base::FileEnumerator::FILES);
+ file_util::FileEnumerator files(dir, false,
+ file_util::FileEnumerator::FILES);
for (base::FilePath current = files.Next(); !current.empty();
current = files.Next()) {
if (current != path)
diff --git a/chrome/browser/chromeos/policy/app_pack_updater.cc b/chrome/browser/chromeos/policy/app_pack_updater.cc
index 156402a5..61fe56f 100644
--- a/chrome/browser/chromeos/policy/app_pack_updater.cc
+++ b/chrome/browser/chromeos/policy/app_pack_updater.cc
@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/location.h"
#include "base/stl_util.h"
#include "base/string_util.h"
@@ -30,6 +29,7 @@
#include "content/public/browser/notification_source.h"
using content::BrowserThread;
+using file_util::FileEnumerator;
namespace policy {
@@ -250,16 +250,18 @@ void AppPackUpdater::BlockingCheckCacheInternal(
// Enumerate all the files in the cache |dir|, including directories
// and symlinks. Each unrecognized file will be erased.
- int types = base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES |
- base::FileEnumerator::SHOW_SYM_LINKS;
- base::FileEnumerator enumerator(dir, false /* recursive */, types);
+ int types = FileEnumerator::FILES | FileEnumerator::DIRECTORIES |
+ FileEnumerator::SHOW_SYM_LINKS;
+ FileEnumerator enumerator(dir, false /* recursive */, types);
for (base::FilePath path = enumerator.Next();
!path.empty(); path = enumerator.Next()) {
- base::FileEnumerator::FileInfo info = enumerator.GetInfo();
+ FileEnumerator::FindInfo info;
+ enumerator.GetFindInfo(&info);
std::string basename = path.BaseName().value();
- if (info.IsDirectory() || file_util::IsLink(info.GetName())) {
+ if (FileEnumerator::IsDirectory(info) ||
+ file_util::IsLink(FileEnumerator::GetFilename(info))) {
LOG(ERROR) << "Erasing bad file in AppPack directory: " << basename;
file_util::Delete(path, true /* recursive */);
continue;
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index 0203a54..2663824 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -13,7 +13,6 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/path_service.h"
@@ -96,8 +95,8 @@ bool GetPepperFlashDirectory(base::FilePath* latest_dir,
std::vector<base::FilePath>* older_dirs) {
base::FilePath base_dir = GetPepperFlashBaseDirectory();
bool found = false;
- base::FileEnumerator
- file_enumerator(base_dir, false, base::FileEnumerator::DIRECTORIES);
+ file_util::FileEnumerator
+ file_enumerator(base_dir, false, file_util::FileEnumerator::DIRECTORIES);
for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
path = file_enumerator.Next()) {
Version version(path.BaseName().MaybeAsASCII());
diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
index 07e5abc..f66b8a9 100644
--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
@@ -9,7 +9,6 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/json/json_file_value_serializer.h"
#include "base/logging.h"
@@ -127,8 +126,8 @@ bool GetLatestPnaclDirectory(PnaclComponentInstaller* pci,
// Enumerate all versions starting from the base directory.
base::FilePath base_dir = pci->GetPnaclBaseDirectory();
bool found = false;
- base::FileEnumerator
- file_enumerator(base_dir, false, base::FileEnumerator::DIRECTORIES);
+ file_util::FileEnumerator
+ file_enumerator(base_dir, false, file_util::FileEnumerator::DIRECTORIES);
for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
path = file_enumerator.Next()) {
Version version(path.BaseName().MaybeAsASCII());
diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc
index f71fd5a..8e365da 100644
--- a/chrome/browser/component_updater/swiftshader_component_installer.cc
+++ b/chrome/browser/component_updater/swiftshader_component_installer.cc
@@ -9,7 +9,6 @@
#include "base/compiler_specific.h"
#include "base/cpu.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/path_service.h"
@@ -64,8 +63,8 @@ bool GetLatestSwiftShaderDirectory(base::FilePath* result,
std::vector<base::FilePath>* older_dirs) {
base::FilePath base_dir = GetSwiftShaderBaseDirectory();
bool found = false;
- base::FileEnumerator
- file_enumerator(base_dir, false, base::FileEnumerator::DIRECTORIES);
+ file_util::FileEnumerator
+ file_enumerator(base_dir, false, file_util::FileEnumerator::DIRECTORIES);
for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
path = file_enumerator.Next()) {
Version version(path.BaseName().MaybeAsASCII());
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
index 123c5fc..f43c28a 100644
--- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
+++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -13,7 +13,6 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/path_service.h"
@@ -94,8 +93,8 @@ bool GetWidevineCdmDirectory(base::FilePath* latest_dir,
std::vector<base::FilePath>* older_dirs) {
base::FilePath base_dir = GetWidevineCdmBaseDirectory();
bool found = false;
- base::FileEnumerator file_enumerator(
- base_dir, false, base::FileEnumerator::DIRECTORIES);
+ file_util::FileEnumerator file_enumerator(
+ base_dir, false, file_util::FileEnumerator::DIRECTORIES);
for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
path = file_enumerator.Next()) {
base::Version version(path.BaseName().MaybeAsASCII());
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index 85a7822..5251024 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -6,7 +6,6 @@
#include "base/base64.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/i18n/file_util_icu.h"
#include "base/strings/string_number_conversions.h"
#include "base/utf_string_conversions.h"
@@ -80,8 +79,9 @@ GURL ToDataURL(const base::FilePath& path) {
}
std::vector<base::FilePath> ListFolder(const base::FilePath path) {
- base::FileEnumerator files(path, false,
- base::FileEnumerator::DIRECTORIES | base::FileEnumerator::FILES);
+ file_util::FileEnumerator files(path, false,
+ file_util::FileEnumerator::DIRECTORIES
+ | file_util::FileEnumerator::FILES);
std::vector<base::FilePath> paths;
for (base::FilePath current_path = files.Next(); !current_path.empty();
diff --git a/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc b/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc
index 505d8b0..ce29ea5 100644
--- a/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc
+++ b/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/extensions/api/serial/serial_port_enumerator.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/string_util.h"
#include "content/public/browser/browser_thread.h"
@@ -68,12 +67,13 @@ SerialPortEnumerator::GenerateValidSerialPortNames() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
const base::FilePath kDevRoot("/dev");
const int kFilesAndSymLinks =
- base::FileEnumerator::FILES |
- base::FileEnumerator::SHOW_SYM_LINKS;
+ file_util::FileEnumerator::FILES |
+ file_util::FileEnumerator::SHOW_SYM_LINKS;
StringSet valid_patterns = GenerateValidPatterns();
StringSet name_set;
- base::FileEnumerator enumerator(kDevRoot, false, kFilesAndSymLinks);
+ file_util::FileEnumerator enumerator(
+ kDevRoot, false, kFilesAndSymLinks);
do {
const base::FilePath next_device_path(enumerator.Next());
const std::string next_device = next_device_path.value();
diff --git a/chrome/browser/extensions/api/storage/settings_backend.cc b/chrome/browser/extensions/api/storage/settings_backend.cc
index 26a15629..369446a 100644
--- a/chrome/browser/extensions/api/storage/settings_backend.cc
+++ b/chrome/browser/extensions/api/storage/settings_backend.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/extensions/api/storage/settings_backend.h"
-#include "base/files/file_enumerator.h"
+#include "base/file_util.h"
#include "base/logging.h"
#include "chrome/browser/extensions/api/storage/settings_sync_processor.h"
#include "chrome/browser/extensions/api/storage/settings_sync_util.h"
@@ -105,10 +105,13 @@ std::set<std::string> SettingsBackend::GetKnownExtensionIDs() const {
}
// Leveldb databases are directories inside base_path_.
- base::FileEnumerator extension_dirs(
- base_path_, false, base::FileEnumerator::DIRECTORIES);
+ file_util::FileEnumerator::FindInfo find_info;
+ file_util::FileEnumerator extension_dirs(
+ base_path_, false, file_util::FileEnumerator::DIRECTORIES);
while (!extension_dirs.Next().empty()) {
- base::FilePath extension_dir = extension_dirs.GetInfo().GetName();
+ extension_dirs.GetFindInfo(&find_info);
+ base::FilePath extension_dir(
+ file_util::FileEnumerator::GetFilename(find_info));
DCHECK(!extension_dir.IsAbsolute());
// Extension IDs are created as std::strings so they *should* be ASCII.
std::string maybe_as_ascii(extension_dir.MaybeAsASCII());
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index b070653..7a79998 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -13,7 +13,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_reader.h"
@@ -1318,8 +1317,8 @@ TEST_F(ExtensionServiceTest, CleanupOnStartup) {
// Wait for GarbageCollectExtensions task to complete.
loop_.RunUntilIdle();
- base::FileEnumerator dirs(extensions_install_dir_, false,
- base::FileEnumerator::DIRECTORIES);
+ file_util::FileEnumerator dirs(extensions_install_dir_, false,
+ file_util::FileEnumerator::DIRECTORIES);
size_t count = 0;
while (!dirs.Next().empty())
count++;
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc
index 46eeb0d..32cb24c 100644
--- a/chrome/browser/extensions/external_pref_loader.cc
+++ b/chrome/browser/extensions/external_pref_loader.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_string_value_serializer.h"
@@ -36,10 +35,10 @@ std::set<base::FilePath> GetPrefsCandidateFilesFromFolder(
return external_extension_paths;
}
- base::FileEnumerator json_files(
+ file_util::FileEnumerator json_files(
external_extension_search_path,
false, // Recursive.
- base::FileEnumerator::FILES);
+ file_util::FileEnumerator::FILES);
#if defined(OS_WIN)
base::FilePath::StringType extension = UTF8ToWide(std::string(".json"));
#elif defined(OS_POSIX)
diff --git a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc
index 968d13a..ddb56c01 100644
--- a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc
+++ b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
@@ -133,10 +132,10 @@ class SandboxedUnpackerTest : public testing::Test {
bool TempFilesRemoved() {
// Check that temporary files were cleaned up.
- int files_and_dirs = base::FileEnumerator::DIRECTORIES |
- base::FileEnumerator::FILES;
+ int files_and_dirs = file_util::FileEnumerator::DIRECTORIES |
+ file_util::FileEnumerator::FILES;
- base::FileEnumerator temp_iterator(
+ file_util::FileEnumerator temp_iterator(
temp_path_,
true, // recursive
files_and_dirs
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc
index e4d5093..48cf490 100644
--- a/chrome/browser/file_select_helper.cc
+++ b/chrome/browser/file_select_helper.cc
@@ -8,7 +8,6 @@
#include "base/bind.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/platform_file.h"
#include "base/string_util.h"
#include "base/strings/string_split.h"
@@ -220,7 +219,7 @@ void FileSelectHelper::OnListFile(
// Directory upload returns directories via a "." file, so that
// empty directories are included. This util call just checks
// the flags in the structure; there's no file I/O going on.
- if (data.info.IsDirectory())
+ if (file_util::FileEnumerator::IsDirectory(data.info))
entry->results_.push_back(data.path.Append(FILE_PATH_LITERAL(".")));
else
entry->results_.push_back(data.path);
diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc
index d21cb0a..51cfaea 100644
--- a/chrome/browser/history/expire_history_backend.cc
+++ b/chrome/browser/history/expire_history_backend.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "chrome/browser/bookmarks/bookmark_service.h"
@@ -755,8 +754,8 @@ void ExpireHistoryBackend::DoExpireHistoryIndexFiles() {
base::FilePath::StringType history_index_files_pattern =
TextDatabase::file_base();
history_index_files_pattern.append(FILE_PATH_LITERAL("*"));
- base::FileEnumerator file_enumerator(
- text_db_->GetDir(), false, base::FileEnumerator::FILES,
+ file_util::FileEnumerator file_enumerator(
+ text_db_->GetDir(), false, file_util::FileEnumerator::FILES,
history_index_files_pattern);
for (base::FilePath file = file_enumerator.Next(); !file.empty();
file = file_enumerator.Next()) {
diff --git a/chrome/browser/history/text_database_manager.cc b/chrome/browser/history/text_database_manager.cc
index 1696610..97f6555 100644
--- a/chrome/browser/history/text_database_manager.cc
+++ b/chrome/browser/history/text_database_manager.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/metrics/histogram.h"
#include "base/logging.h"
#include "base/message_loop.h"
@@ -161,8 +160,8 @@ void TextDatabaseManager::InitDBList() {
// Find files on disk matching our pattern so we can quickly test for them.
base::FilePath::StringType filepattern(TextDatabase::file_base());
filepattern.append(FILE_PATH_LITERAL("*"));
- base::FileEnumerator enumerator(
- dir_, false, base::FileEnumerator::FILES, filepattern);
+ file_util::FileEnumerator enumerator(
+ dir_, false, file_util::FileEnumerator::FILES, filepattern);
base::FilePath cur_file;
while (!(cur_file = enumerator.Next()).empty()) {
// Convert to the number representing this file.
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
index 72ce2c6..9d70c53 100644
--- a/chrome/browser/importer/firefox2_importer.cc
+++ b/chrome/browser/importer/firefox2_importer.cc
@@ -8,7 +8,6 @@
#include <vector>
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/i18n/icu_string_conversions.h"
#include "base/message_loop.h"
@@ -625,9 +624,9 @@ void Firefox2Importer::HTMLUnescape(string16* text) {
void Firefox2Importer::FindXMLFilesInDir(
const base::FilePath& dir,
std::vector<base::FilePath>* xml_files) {
- base::FileEnumerator file_enum(dir, false,
- base::FileEnumerator::FILES,
- FILE_PATH_LITERAL("*.xml"));
+ file_util::FileEnumerator file_enum(dir, false,
+ file_util::FileEnumerator::FILES,
+ FILE_PATH_LITERAL("*.xml"));
base::FilePath file(file_enum.Next());
while (!file.empty()) {
xml_files->push_back(file);
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index 03fa5e2..2cab2ca 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -7,7 +7,6 @@
#include <set>
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/stl_util.h"
@@ -420,7 +419,8 @@ void Firefox3Importer::GetSearchEnginesXMLFiles(
#endif
// Get search engine definition from file system.
- base::FileEnumerator engines(app_path, false, base::FileEnumerator::FILES);
+ file_util::FileEnumerator engines(app_path, false,
+ file_util::FileEnumerator::FILES);
for (base::FilePath engine_path = engines.Next();
!engine_path.value().empty(); engine_path = engines.Next()) {
files->push_back(engine_path);
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index 904f54e..bfcfd01 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -16,7 +16,6 @@
#include <vector>
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/string16.h"
#include "base/string_util.h"
@@ -817,8 +816,8 @@ void IEImporter::ParseFavoritesFolder(
// Favorites path length. Make sure it doesn't include the trailing \.
size_t favorites_path_len =
favorites_path.StripTrailingSeparators().value().size();
- base::FileEnumerator file_enumerator(
- favorites_path, true, base::FileEnumerator::FILES);
+ file_util::FileEnumerator file_enumerator(
+ favorites_path, true, file_util::FileEnumerator::FILES);
while (!(file = file_enumerator.Next()).value().empty() && !cancelled())
file_list.push_back(file.value());
diff --git a/chrome/browser/policy/config_dir_policy_loader.cc b/chrome/browser/policy/config_dir_policy_loader.cc
index 56b079d..572a82d 100644
--- a/chrome/browser/policy/config_dir_policy_loader.cc
+++ b/chrome/browser/policy/config_dir_policy_loader.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_reader.h"
#include "base/logging.h"
@@ -101,8 +100,8 @@ base::Time ConfigDirPolicyLoader::LastModificationTime() {
continue;
// Enumerate the files and find the most recent modification timestamp.
- base::FileEnumerator file_enumerator(path, false,
- base::FileEnumerator::FILES);
+ file_util::FileEnumerator file_enumerator(path, false,
+ file_util::FileEnumerator::FILES);
for (base::FilePath config_file = file_enumerator.Next();
!config_file.empty();
config_file = file_enumerator.Next()) {
@@ -119,8 +118,8 @@ void ConfigDirPolicyLoader::LoadFromPath(const base::FilePath& path,
PolicyBundle* bundle) {
// Enumerate the files and sort them lexicographically.
std::set<base::FilePath> files;
- base::FileEnumerator file_enumerator(path, false,
- base::FileEnumerator::FILES);
+ file_util::FileEnumerator file_enumerator(path, false,
+ file_util::FileEnumerator::FILES);
for (base::FilePath config_file_path = file_enumerator.Next();
!config_file_path.empty(); config_file_path = file_enumerator.Next())
files.insert(config_file_path);
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 841f9d9..3a7a78d 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -10,7 +10,6 @@
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
@@ -278,7 +277,8 @@ void DownloadAndVerifyFile(
EXPECT_EQ(
1u, observer.NumDownloadsSeenInState(content::DownloadItem::COMPLETE));
EXPECT_TRUE(file_util::PathExists(downloaded));
- base::FileEnumerator enumerator(dir, false, base::FileEnumerator::FILES);
+ file_util::FileEnumerator enumerator(
+ dir, false, file_util::FileEnumerator::FILES);
EXPECT_EQ(file, enumerator.Next().BaseName());
EXPECT_EQ(base::FilePath(), enumerator.Next());
}
@@ -287,9 +287,9 @@ void DownloadAndVerifyFile(
int CountScreenshots() {
DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext(
ash::Shell::GetInstance()->delegate()->GetCurrentBrowserContext());
- base::FileEnumerator enumerator(download_prefs->DownloadPath(),
- false, base::FileEnumerator::FILES,
- "Screenshot*");
+ file_util::FileEnumerator enumerator(download_prefs->DownloadPath(),
+ false, file_util::FileEnumerator::FILES,
+ "Screenshot*");
int count = 0;
while (!enumerator.Next().empty())
count++;
diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc
index 23ee6a7..2e00618 100644
--- a/chrome/browser/printing/printing_layout_browsertest.cc
+++ b/chrome/browser/printing/printing_layout_browsertest.cc
@@ -4,7 +4,6 @@
#include "base/command_line.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/message_loop.h"
#include "base/path_service.h"
@@ -196,8 +195,8 @@ class PrintingLayoutTest : public PrintingTest<InProcessBrowserTest>,
bool found_emf = false;
bool found_prn = false;
for (int i = 0; i < 100; ++i) {
- base::FileEnumerator enumerator(emf_path_, false,
- base::FileEnumerator::FILES);
+ file_util::FileEnumerator enumerator(emf_path_, false,
+ file_util::FileEnumerator::FILES);
emf_file.clear();
prn_file.clear();
found_emf = false;
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 12ae9e3..a1ed001 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -10,7 +10,6 @@
#include "base/command_line.h"
#include "base/deferred_sequenced_task_runner.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/metrics/histogram.h"
#include "base/prefs/pref_registry_simple.h"
@@ -95,10 +94,14 @@ std::vector<base::FilePath>& ProfilesToDelete() {
int64 ComputeFilesSize(const base::FilePath& directory,
const base::FilePath::StringType& pattern) {
int64 running_size = 0;
- base::FileEnumerator iter(directory, false, base::FileEnumerator::FILES,
- pattern);
- while (!iter.Next().empty())
- running_size += iter.GetInfo().GetSize();
+ file_util::FileEnumerator iter(directory, false,
+ file_util::FileEnumerator::FILES,
+ pattern);
+ while (!iter.Next().empty()) {
+ file_util::FileEnumerator::FindInfo info;
+ iter.GetFindInfo(&info);
+ running_size += file_util::FileEnumerator::GetFilesize(info);
+ }
return running_size;
}
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
index d0b0b94..92ac0ea 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -12,7 +12,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/path_service.h"
#include "base/string16.h"
#include "base/string_util.h"
@@ -233,8 +232,8 @@ void ListDesktopShortcutsWithCommandLine(const base::FilePath& chrome_exe,
if (!GetDesktopShortcutsDirectories(&user_shortcuts_directory, NULL))
return;
- base::FileEnumerator enumerator(user_shortcuts_directory, false,
- base::FileEnumerator::FILES);
+ file_util::FileEnumerator enumerator(user_shortcuts_directory, false,
+ file_util::FileEnumerator::FILES);
for (base::FilePath path = enumerator.Next(); !path.empty();
path = enumerator.Next()) {
string16 shortcut_command_line;
@@ -400,8 +399,8 @@ bool ChromeDesktopShortcutsExist(const base::FilePath& chrome_exe) {
if (!GetDesktopShortcutsDirectories(&user_shortcuts_directory, NULL))
return false;
- base::FileEnumerator enumerator(user_shortcuts_directory, false,
- base::FileEnumerator::FILES);
+ file_util::FileEnumerator enumerator(user_shortcuts_directory, false,
+ file_util::FileEnumerator::FILES);
for (base::FilePath path = enumerator.Next(); !path.empty();
path = enumerator.Next()) {
if (IsChromeShortcut(path, chrome_exe, NULL))
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index c73fc2c..fb1bd64 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/string_util.h"
@@ -393,9 +392,9 @@ int ShellIntegration::MigrateShortcutsInPathInternal(
DCHECK(base::win::GetVersion() >= base::win::VERSION_WIN7);
// Enumerate all pinned shortcuts in the given path directly.
- base::FileEnumerator shortcuts_enum(
+ file_util::FileEnumerator shortcuts_enum(
path, false, // not recursive
- base::FileEnumerator::FILES, FILE_PATH_LITERAL("*.lnk"));
+ file_util::FileEnumerator::FILES, FILE_PATH_LITERAL("*.lnk"));
bool is_per_user_install =
InstallUtil::IsPerUserInstall(chrome_exe.value().c_str());
diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc
index fe95498..f73fefb 100644
--- a/chrome/browser/ui/pdf/pdf_browsertest.cc
+++ b/chrome/browser/ui/pdf/pdf_browsertest.cc
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/hash.h"
#include "base/path_service.h"
#include "base/string_util.h"
@@ -315,10 +314,10 @@ IN_PROC_BROWSER_TEST_P(PDFBrowserTest, Loading) {
content::Source<NavigationController>(controller));
std::string base_url = std::string("files/");
- base::FileEnumerator file_enumerator(
+ file_util::FileEnumerator file_enumerator(
ui_test_utils::GetTestFilePath(GetPDFTestDir(), base::FilePath()),
false,
- base::FileEnumerator::FILES,
+ file_util::FileEnumerator::FILES,
FILE_PATH_LITERAL("*.pdf"));
for (base::FilePath file_path = file_enumerator.Next();
!file_path.empty();
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index 90a2ca9..6483cd7 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/format_macros.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
@@ -61,22 +60,26 @@ namespace {
void GetGCacheContents(const base::FilePath& root_path,
base::ListValue* gcache_contents,
base::DictionaryValue* gcache_summary) {
+ using file_util::FileEnumerator;
// Use this map to sort the result list by the path.
std::map<base::FilePath, DictionaryValue*> files;
- const int options = (base::FileEnumerator::FILES |
- base::FileEnumerator::DIRECTORIES |
- base::FileEnumerator::SHOW_SYM_LINKS);
- base::FileEnumerator enumerator(root_path, true /* recursive */, options);
+ const int options = (file_util::FileEnumerator::FILES |
+ file_util::FileEnumerator::DIRECTORIES |
+ file_util::FileEnumerator::SHOW_SYM_LINKS);
+ FileEnumerator enumerator(root_path, true /* recursive */, options);
int64 total_size = 0;
for (base::FilePath current = enumerator.Next(); !current.empty();
current = enumerator.Next()) {
- base::FileEnumerator::FileInfo find_info = enumerator.GetInfo();
- int64 size = find_info.GetSize();
- const bool is_directory = find_info.IsDirectory();
- const bool is_symbolic_link = file_util::IsLink(find_info.GetName());
- const base::Time last_modified = find_info.GetLastModifiedTime();
+ FileEnumerator::FindInfo find_info;
+ enumerator.GetFindInfo(&find_info);
+ int64 size = FileEnumerator::GetFilesize(find_info);
+ const bool is_directory = FileEnumerator::IsDirectory(find_info);
+ const bool is_symbolic_link =
+ file_util::IsLink(FileEnumerator::GetFilename(find_info));
+ const base::Time last_modified =
+ FileEnumerator::GetLastModifiedTime(find_info);
base::DictionaryValue* entry = new base::DictionaryValue;
entry->SetString("path", current.value());
@@ -90,7 +93,7 @@ void GetGCacheContents(const base::FilePath& root_path,
// Print lower 9 bits in octal format.
entry->SetString(
"permission",
- base::StringPrintf("%03o", find_info.stat().st_mode & 0x1ff));
+ base::StringPrintf("%03o", find_info.stat.st_mode & 0x1ff));
files[current] = entry;
total_size += size;
diff --git a/chrome/browser/ui/webui/feedback_ui.cc b/chrome/browser/ui/webui/feedback_ui.cc
index 30b12d0..1d09ab9 100644
--- a/chrome/browser/ui/webui/feedback_ui.cc
+++ b/chrome/browser/ui/webui/feedback_ui.cc
@@ -10,7 +10,6 @@
#include "base/base64.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/files/file_enumerator.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
@@ -705,8 +704,9 @@ void FeedbackUI::GetMostRecentScreenshots(
std::string pattern =
std::string(ScreenshotSource::kScreenshotPrefix) + "*" +
ScreenshotSource::kScreenshotSuffix;
- base::FileEnumerator screenshots(filepath, false,
- base::FileEnumerator::FILES, pattern);
+ file_util::FileEnumerator screenshots(filepath, false,
+ file_util::FileEnumerator::FILES,
+ pattern);
base::FilePath screenshot = screenshots.Next();
std::vector<std::string> screenshot_filepaths;