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

trunk/src/chrome/test/perf/page_cycler_test.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/basictypes.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/path_service.h"
 #include "base/process_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 43 matching lines @@
   // into the cache we equalize the tests for comparing timing data.
 
   // We don't want to walk into .svn dirs, so we have to do the tree walk
   // ourselves.
 
   std::vector<base::FilePath> dirs;
   dirs.push_back(test_dir);
   const base::FilePath svn_dir(FILE_PATH_LITERAL(".svn"));
 
   for (size_t idx = 0; idx < dirs.size(); ++idx) {
-    base::FileEnumerator dir_enumerator(dirs[idx], false,
-                                        base::FileEnumerator::DIRECTORIES);
+    file_util::FileEnumerator dir_enumerator(dirs[idx], false,
+                                      file_util::FileEnumerator::DIRECTORIES);
     base::FilePath path;
     for (path = dir_enumerator.Next();
          !path.empty();
          path = dir_enumerator.Next()) {
       if (path.BaseName() != svn_dir)
         dirs.push_back(path);
     }
   }
 
   unsigned int loaded = 0;
 
   // We seem to have some files in the data dirs that are just there for
   // reference, make a quick attempt to skip them by matching suffixes.
   std::vector<base::FilePath::StringType> ignore_suffixes;
   ignore_suffixes.push_back(FILE_PATH_LITERAL(".orig.html"));
   ignore_suffixes.push_back(FILE_PATH_LITERAL(".html-original"));
 
   std::vector<base::FilePath>::const_iterator iter;
   for (iter = dirs.begin(); iter != dirs.end(); ++iter) {
-    base::FileEnumerator file_enumerator(*iter, false,
-                                         base::FileEnumerator::FILES);
+    file_util::FileEnumerator file_enumerator(*iter, false,
+                                              file_util::FileEnumerator::FILES);
     base::FilePath path;
     for (path = file_enumerator.Next();
          !path.empty();
          path = file_enumerator.Next()) {
       const base::FilePath base_name = path.BaseName();
       const size_t base_name_size = base_name.value().size();
 
       bool should_skip = false;
       std::vector<base::FilePath::StringType>::const_iterator ignore_iter;
       for (ignore_iter = ignore_suffixes.begin();
@@ skipping 574 matching lines @@
 TEST_F(PageCyclerAccessibilityTest, MozFileWithAccessibilityEnabled) {
   num_test_iterations_ = 1;
   RunTest("times", "moz", false);
 }
 
 TEST_F(PageCyclerAccessibilityTest, MorejsFileWithAccessibilityEnabled) {
   RunTest("times", "morejs", false);
 }
 
 }  // namespace