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

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

Index: trunk/src/chrome/installer/util/installer_state.cc
===================================================================
--- trunk/src/chrome/installer/util/installer_state.cc	(revision 198849)
+++ trunk/src/chrome/installer/util/installer_state.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
-#include "base/files/file_enumerator.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
@@ -650,8 +649,8 @@
   GetExistingExeVersions(&existing_version_strings);
 
   // Try to delete all directories that are not in the set we care to keep.
-  base::FileEnumerator version_enum(target_path(), false,
-                                    base::FileEnumerator::DIRECTORIES);
+  file_util::FileEnumerator version_enum(target_path(), false,
+      file_util::FileEnumerator::DIRECTORIES);
   for (base::FilePath next_version = version_enum.Next(); !next_version.empty();
        next_version = version_enum.Next()) {
     base::FilePath dir_name(next_version.BaseName());