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

trunk/src/chrome/test/reliability/page_load_test.cc

Index: trunk/src/chrome/test/reliability/page_load_test.cc
===================================================================
--- trunk/src/chrome/test/reliability/page_load_test.cc	(revision 198849)
+++ trunk/src/chrome/test/reliability/page_load_test.cc	(working copy)
@@ -41,7 +41,6 @@
 #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"
@@ -637,9 +636,9 @@
       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")))
@@ -688,9 +687,9 @@
   }
 
   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")) &&
@@ -708,9 +707,9 @@
                             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")) &&