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 /gpu | |
| 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 'gpu')
| -rw-r--r-- | gpu/config/gpu_info_collector_win.cc | 5 | ||||
| -rw-r--r-- | gpu/tools/compositor_model_bench/compositor_model_bench.cc | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc index b55ebe7..5fcdc9f 100644 --- a/gpu/config/gpu_info_collector_win.cc +++ b/gpu/config/gpu_info_collector_win.cc @@ -17,6 +17,7 @@ #include "base/debug/trace_event.h" #include "base/metrics/field_trial.h" #include "base/file_util.h" +#include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/logging.h" #include "base/message_loop.h" @@ -80,10 +81,10 @@ GpuPerformanceStats RetrieveGpuPerformanceStats() { } // Find most recent formal assessment results. - file_util::FileEnumerator file_enumerator( + base::FileEnumerator file_enumerator( base::FilePath(winsat_results_path), false, // not recursive - file_util::FileEnumerator::FILES, + base::FileEnumerator::FILES, FILE_PATH_LITERAL("* * Formal.Assessment (*).WinSAT.xml")); base::FilePath current_results; diff --git a/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/gpu/tools/compositor_model_bench/compositor_model_bench.cc index 6a7c834..613ee7f 100644 --- a/gpu/tools/compositor_model_bench/compositor_model_bench.cc +++ b/gpu/tools/compositor_model_bench/compositor_model_bench.cc @@ -26,6 +26,7 @@ #include "base/bind.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/memory/scoped_ptr.h" #include "base/message_loop.h" @@ -39,7 +40,6 @@ using base::TimeTicks; using file_util::CloseFile; using file_util::DirectoryExists; -using file_util::FileEnumerator; using file_util::OpenFile; using file_util::PathExists; using std::queue; @@ -389,7 +389,7 @@ int main(int argc, char* argv[]) { if (DirectoryExists(inPath)) { LOG(INFO) << "(input path is a directory)"; - FileEnumerator dirItr(inPath, true, FileEnumerator::FILES); + base::FileEnumerator dirItr(inPath, true, base::FileEnumerator::FILES); for (base::FilePath f = dirItr.Next(); !f.empty(); f = dirItr.Next()) { sim.QueueTest(f); } |