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

trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc

Index: trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc
===================================================================
--- trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc	(revision 198849)
+++ trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc	(working copy)
@@ -26,7 +26,6 @@
 #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"
@@ -40,6 +39,7 @@
 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 @@
 
   if (DirectoryExists(inPath)) {
     LOG(INFO) << "(input path is a directory)";
-    base::FileEnumerator dirItr(inPath, true, base::FileEnumerator::FILES);
+    FileEnumerator dirItr(inPath, true, FileEnumerator::FILES);
     for (base::FilePath f = dirItr.Next(); !f.empty(); f = dirItr.Next()) {
       sim.QueueTest(f);
     }