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

trunk/src/chrome/browser/policy/config_dir_policy_loader.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.
 
 #include "chrome/browser/policy/config_dir_policy_loader.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
 #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"
 #include "base/platform_file.h"
 #include "base/stl_util.h"
 #include "chrome/browser/policy/policy_bundle.h"
 #include "chrome/browser/policy/policy_load_status.h"
 
 namespace policy {
 
@@ skipping 69 matching lines @@
   base::PlatformFileInfo info;
 
   for (size_t i = 0; i < arraysize(kConfigDirSuffixes); ++i) {
     base::FilePath path(config_dir_.Append(kConfigDirSuffixes[i]));
 
     // Skip if the file doesn't exist, or it isn't a directory.
     if (!file_util::GetFileInfo(path, &info) || !info.is_directory)
       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()) {
       if (file_util::GetFileInfo(config_file, &info) && !info.is_directory)
         last_modification = std::max(last_modification, info.last_modified);
     }
   }
 
   return last_modification;
 }
 
 void ConfigDirPolicyLoader::LoadFromPath(const base::FilePath& path,
                                          PolicyLevel level,
                                          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);
 
   PolicyLoadStatusSample status;
   if (files.empty()) {
     status.Add(POLICY_LOAD_STATUS_NO_POLICY);
     return;
   }
 
@@ skipping 90 matching lines @@
   }
 }
 
 void ConfigDirPolicyLoader::OnFileUpdated(const base::FilePath& path,
                                           bool error) {
   if (!error)
     Reload(false);
 }
 
 }  // namespace policy