| Index: chrome/browser/policy/config_dir_policy_loader.cc
|
| diff --git a/chrome/browser/policy/config_dir_policy_loader.cc b/chrome/browser/policy/config_dir_policy_loader.cc
|
| index 572a82d4085d6367829daefda32795e57c69570f..56b079dd2548d2ffa58cac9244ff3f962a676875 100644
|
| --- a/chrome/browser/policy/config_dir_policy_loader.cc
|
| +++ b/chrome/browser/policy/config_dir_policy_loader.cc
|
| @@ -11,6 +11,7 @@
|
| #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"
|
| @@ -100,8 +101,8 @@ base::Time ConfigDirPolicyLoader::LastModificationTime() {
|
| continue;
|
|
|
| // Enumerate the files and find the most recent modification timestamp.
|
| - file_util::FileEnumerator file_enumerator(path, false,
|
| - file_util::FileEnumerator::FILES);
|
| + base::FileEnumerator file_enumerator(path, false,
|
| + base::FileEnumerator::FILES);
|
| for (base::FilePath config_file = file_enumerator.Next();
|
| !config_file.empty();
|
| config_file = file_enumerator.Next()) {
|
| @@ -118,8 +119,8 @@ void ConfigDirPolicyLoader::LoadFromPath(const base::FilePath& path,
|
| PolicyBundle* bundle) {
|
| // Enumerate the files and sort them lexicographically.
|
| std::set<base::FilePath> files;
|
| - file_util::FileEnumerator file_enumerator(path, false,
|
| - file_util::FileEnumerator::FILES);
|
| + base::FileEnumerator file_enumerator(path, false,
|
| + base::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);
|
|
|