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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198820 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

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);
     }