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

trunk/src/chrome/test/gpu/gpu_pixel_browsertest.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.
 
 #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"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 396 matching lines @@
       LOG(ERROR) << "Decode PNG to a SkBitmap failed";
       return false;
     }
     return true;
   }
 
   // If no valid local revision file is located, the ref_img_revision_ is 0.
   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();
          !full_path.empty();
          full_path = locator.Next()) {
       std::string filename =
           full_path.BaseName().RemoveExtension().MaybeAsASCII();
       std::string revision_string =
           filename.substr(test_name_.length() + 1);
       int64 revision = 0;
@@ skipping 103 matching lines @@
     {160, 100, 0, 0, 0}
   };
   const size_t ref_pixel_count = sizeof(ref_pixels) / sizeof(ReferencePixel);
 
   gfx::Size container_size(400, 300);
   base::FilePath url =
       test_data_dir().AppendASCII("pixel_canvas2d.html");
   RunPixelTest(container_size, url, ref_img_revision_update,
                ref_pixels, ref_pixel_count);
 }