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

trunk/src/chrome/browser/policy/config_dir_policy_loader.cc

Index: trunk/src/chrome/browser/policy/config_dir_policy_loader.cc
===================================================================
--- trunk/src/chrome/browser/policy/config_dir_policy_loader.cc	(revision 198849)
+++ trunk/src/chrome/browser/policy/config_dir_policy_loader.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
@@ -101,8 +100,8 @@
       continue;
 
     // Enumerate the files and find the most recent modification timestamp.
-    base::FileEnumerator file_enumerator(path, false,
-                                         base::FileEnumerator::FILES);
+    file_util::FileEnumerator file_enumerator(path, false,
+                                              file_util::FileEnumerator::FILES);
     for (base::FilePath config_file = file_enumerator.Next();
          !config_file.empty();
          config_file = file_enumerator.Next()) {
@@ -119,8 +118,8 @@
                                          PolicyBundle* bundle) {
   // Enumerate the files and sort them lexicographically.
   std::set<base::FilePath> files;
-  base::FileEnumerator file_enumerator(path, false,
-                                       base::FileEnumerator::FILES);
+  file_util::FileEnumerator file_enumerator(path, false,
+                                            file_util::FileEnumerator::FILES);
   for (base::FilePath config_file_path = file_enumerator.Next();
        !config_file_path.empty(); config_file_path = file_enumerator.Next())
     files.insert(config_file_path);