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

trunk/src/chrome/test/reliability/page_load_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.
 //
 // This file provides reliablity test which runs under UI test framework. The
 // test is intended to run within QEMU environment.
 //
 // Usage 1: reliability_test
 // Upon invocation, it visits a hard coded list of sample URLs. This is mainly
 // used by buildbot, to verify reliability_test itself runs ok.
@@ skipping 23 matching lines @@
 // --searchdumpsbypid: Look for crash dumps by browser process id.
 //                     "crash_dir/pid/"
 
 #include <fstream>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/test_file_util.h"
@@ skipping 575 matching lines @@
     // If 'BREAKPAD_DUMP_LOCATION' environment variable is set, use it instead.
     scoped_ptr<base::Environment> env(base::Environment::Create());
     std::string alternate_minidump_location;
     if (env->GetVar("BREAKPAD_DUMP_LOCATION", &alternate_minidump_location)) {
       crash_dumps_dir_path_ = base::FilePath::FromUTF8Unsafe(
           alternate_minidump_location);
     } else {
       PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dumps_dir_path_);
     }
 
-    base::FileEnumerator enumerator(crash_dumps_dir_path_,
-                                    false,  // not recursive
-                                    base::FileEnumerator::FILES);
+    file_util::FileEnumerator enumerator(crash_dumps_dir_path_,
+                                         false,  // not recursive
+                                         file_util::FileEnumerator::FILES);
     for (base::FilePath path = enumerator.Next(); !path.value().empty();
          path = enumerator.Next()) {
       if (path.MatchesExtension(FILE_PATH_LITERAL(".dmp")))
         crash_dumps_[path.BaseName()] = true;
     }
   }
 
   base::FilePath ConstructSavedDebugLogPath(
       const base::FilePath& debug_log_path,
       int index) {
@@ skipping 28 matching lines @@
     base::FilePath crash_dump_file_path(crash_dumps_dir_path_);
     crash_dump_file_path = crash_dump_file_path.Append(crash_dump_file_name);
     base::FilePath crash_text_file_path =
         crash_dump_file_path.ReplaceExtension(FILE_PATH_LITERAL("txt"));
 
     ASSERT_TRUE(file_util::DieFileDie(crash_dump_file_path, false));
     ASSERT_TRUE(file_util::DieFileDie(crash_text_file_path, false));
   }
 
   bool HasNewCrashDumps() {
-    base::FileEnumerator enumerator(crash_dumps_dir_path_,
-                                    false,  // not recursive
-                                    base::FileEnumerator::FILES);
+    file_util::FileEnumerator enumerator(crash_dumps_dir_path_,
+                                         false,  // not recursive
+                                         file_util::FileEnumerator::FILES);
     for (base::FilePath path = enumerator.Next(); !path.value().empty();
          path = enumerator.Next()) {
       if (path.MatchesExtension(FILE_PATH_LITERAL(".dmp")) &&
           !crash_dumps_[path.BaseName()]) {
         return true;
       }
     }
 
     return false;
   }
 
   // Check whether there are new .dmp files. Return the list and optionally
   // delete them afterwards.
   void CollectNewCrashDumps(std::vector<base::FilePath>& new_crash_dumps,
                             NavigationMetrics* metrics,
                             bool delete_dumps) {
     int num_dumps = 0;
-    base::FileEnumerator enumerator(crash_dumps_dir_path_,
-                                    false,  // not recursive
-                                    base::FileEnumerator::FILES);
+    file_util::FileEnumerator enumerator(crash_dumps_dir_path_,
+                                         false,  // not recursive
+                                         file_util::FileEnumerator::FILES);
     for (base::FilePath path = enumerator.Next(); !path.value().empty();
          path = enumerator.Next()) {
       if (path.MatchesExtension(FILE_PATH_LITERAL(".dmp")) &&
           !crash_dumps_[path.BaseName()]) {
         crash_dumps_[path.BaseName()] = true;
         base::FilePath crash_dump_file_path(crash_dumps_dir_path_);
         crash_dump_file_path = crash_dump_file_path.Append(path.BaseName());
         new_crash_dumps.push_back(crash_dump_file_path);
         if (delete_dumps)
           DeleteCrashDump(path.BaseName());
@@ skipping 87 matching lines @@
   if (!g_end_url.empty()) {
     NavigateToURLLogResult(
         g_end_url, log_file, NULL, g_continuous_load, false);
   }
 
   log_file.close();
 }
 
 }  // namespace