Move FileEnumerator to its own file, do some refactoring.

gpu/tools/compositor_model_bench/compositor_model_bench.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This tool is used to benchmark the render model used by the compositor
 
 // Most of this file is derived from the source of the tile_render_bench tool,
 // and has been changed to  support running a sequence of independent
 // simulations for our different render models and test cases.
 
 #include <stdio.h>
 #include <sys/dir.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #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"
 #include "base/time.h"
 
 #include "gpu/tools/compositor_model_bench/render_model_utils.h"
 #include "gpu/tools/compositor_model_bench/render_models.h"
 #include "gpu/tools/compositor_model_bench/render_tree.h"
 
 
 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;
 using std::string;
 
 struct SimulationSpecification {
   string simulation_name;
   base::FilePath input_path;
   RenderModel model_under_test;
   TimeTicks simulation_start_time;
@@ skipping 329 matching lines @@
   Simulator sim(seconds_per_test, cl->GetSwitchValuePath("out"));
   base::FilePath inPath = cl->GetSwitchValuePath("in");
 
   if (!PathExists(inPath)) {
     LOG(FATAL) << "Path does not exist: " << inPath.LossyDisplayName();
     return -1;
   }
 
   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);
     }
   } else {
     LOG(INFO) << "(input path is a file)";
     sim.QueueTest(inPath);
   }
 
   sim.Run();
 
   return 0;
 }