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

trunk/src/chrome/installer/util/delete_after_reboot_helper.cc

Index: trunk/src/chrome/installer/util/delete_after_reboot_helper.cc
===================================================================
--- trunk/src/chrome/installer/util/delete_after_reboot_helper.cc	(revision 198849)
+++ trunk/src/chrome/installer/util/delete_after_reboot_helper.cc	(working copy)
@@ -16,7 +16,6 @@
 #include <vector>
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/win/registry.h"
 #include "base/string_util.h"
 
@@ -117,8 +116,8 @@
   // First schedule all the normal files for deletion.
   {
     bool success = true;
-    base::FileEnumerator file_enum(base::FilePath(dir_name), false,
-                                   base::FileEnumerator::FILES);
+    file_util::FileEnumerator file_enum(base::FilePath(dir_name), false,
+                                        file_util::FileEnumerator::FILES);
     for (base::FilePath file = file_enum.Next(); !file.empty();
          file = file_enum.Next()) {
       success = ScheduleFileSystemEntityForDeletion(file.value().c_str());
@@ -132,8 +131,8 @@
   // Then recurse to all the subdirectories.
   {
     bool success = true;
-    base::FileEnumerator dir_enum(base::FilePath(dir_name), false,
-                                  base::FileEnumerator::DIRECTORIES);
+    file_util::FileEnumerator dir_enum(base::FilePath(dir_name), false,
+                                       file_util::FileEnumerator::DIRECTORIES);
     for (base::FilePath sub_dir = dir_enum.Next(); !sub_dir.empty();
          sub_dir = dir_enum.Next()) {
       success = ScheduleDirectoryForDeletion(sub_dir.value().c_str());