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

trunk/src/chrome/test/gpu/gpu_pixel_browsertest.cc

Index: trunk/src/chrome/test/gpu/gpu_pixel_browsertest.cc
===================================================================
--- trunk/src/chrome/test/gpu/gpu_pixel_browsertest.cc	(revision 198849)
+++ trunk/src/chrome/test/gpu/gpu_pixel_browsertest.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ -421,10 +420,10 @@
   void ObtainLocalRefImageRevision() {
     base::FilePath filter;
     filter = filter.AppendASCII(test_name_ + "_*.rev");
-    base::FileEnumerator locator(ref_img_dir_,
-                                 false,  // non recursive
-                                 base::FileEnumerator::FILES,
-                                 filter.value());
+    file_util::FileEnumerator locator(ref_img_dir_,
+                                      false,  // non recursive
+                                      file_util::FileEnumerator::FILES,
+                                      filter.value());
     int64 max_revision = 0;
     std::vector<base::FilePath> outdated_revs;
     for (base::FilePath full_path = locator.Next();