diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 04:53:36 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 04:53:36 +0000 |
| commit | 25a4c1ccaee2b032ee368d733b79ac814efd7c37 (patch) | |
| tree | 589cd0233167acf4a3fe7bdaf50cea24ad505b7b /tools | |
| parent | aff39ac8a8ea09920b9180ebc09d72c15832f3ad (diff) | |
| download | chromium_src-25a4c1ccaee2b032ee368d733b79ac814efd7c37.zip chromium_src-25a4c1ccaee2b032ee368d733b79ac814efd7c37.tar.gz chromium_src-25a4c1ccaee2b032ee368d733b79ac814efd7c37.tar.bz2 | |
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
Reland of 198820 and 298824
Original review = https://codereview.chromium.org/13165005
R=rvargas@chromium.org
Review URL: https://codereview.chromium.org/16392011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/md5sum/md5sum.cc | 5 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 4 | ||||
| -rw-r--r-- | tools/valgrind/tsan/suppressions.txt | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/tools/android/md5sum/md5sum.cc b/tools/android/md5sum/md5sum.cc index ceee7d5..8543fb6 100644 --- a/tools/android/md5sum/md5sum.cc +++ b/tools/android/md5sum/md5sum.cc @@ -11,6 +11,7 @@ #include <string> #include "base/file_util.h" +#include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/logging.h" #include "base/md5.h" @@ -53,8 +54,8 @@ std::set<std::string> MakeFileSet(const char** files) { for (const char** file = files; *file; ++file) { base::FilePath file_path(*file); if (file_util::DirectoryExists(file_path)) { - file_util::FileEnumerator file_enumerator( - file_path, true /* recurse */, file_util::FileEnumerator::FILES); + base::FileEnumerator file_enumerator( + file_path, true /* recurse */, base::FileEnumerator::FILES); for (base::FilePath child, empty; (child = file_enumerator.Next()) != empty; ) { // If the path contains /.svn/, ignore it. diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index 5bbef01..f83feb37 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -531,8 +531,8 @@ fun:std::string::_S_construct_aux fun:std::string::_S_construct fun:*basic_string* - fun:file_util::FileEnumerator::ReadDirectory - fun:file_util::FileEnumerator::Next + fun:base::FileEnumerator::ReadDirectory + fun:base::FileEnumerator::Next fun:::RelayReadDirectory::RunWork fun:::MessageLoopRelay::ProcessOnTargetThread } diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt index a771a48..5d0d847 100644 --- a/tools/valgrind/tsan/suppressions.txt +++ b/tools/valgrind/tsan/suppressions.txt @@ -944,8 +944,8 @@ ThreadSanitizer:Race fun:__alloc_dir fun:opendir - fun:file_util::FileEnumerator::ReadDirectory - fun:file_util::FileEnumerator::Next + fun:base::FileEnumerator::ReadDirectory + fun:base::FileEnumerator::Next fun:::GetPrefsCandidateFilesFromFolder fun:ExternalPrefLoader::ReadStandaloneExtensionPrefFiles fun:ExternalPrefLoader::LoadOnFileThread |