| Index: chrome/browser/extensions/api/storage/settings_backend.cc
|
| diff --git a/chrome/browser/extensions/api/storage/settings_backend.cc b/chrome/browser/extensions/api/storage/settings_backend.cc
|
| index fbcdd17f1890702c301fbdc33c6060c81e73fddf..e1a5d37163ca6cda4522735781f83d4f0ab8f5f4 100644
|
| --- a/chrome/browser/extensions/api/storage/settings_backend.cc
|
| +++ b/chrome/browser/extensions/api/storage/settings_backend.cc
|
| @@ -4,7 +4,7 @@
|
|
|
| #include "chrome/browser/extensions/api/storage/settings_backend.h"
|
|
|
| -#include "base/file_util.h"
|
| +#include "base/files/file_enumerator.h"
|
| #include "base/logging.h"
|
| #include "chrome/browser/extensions/api/storage/settings_sync_processor.h"
|
| #include "chrome/browser/extensions/api/storage/settings_sync_util.h"
|
| @@ -115,13 +115,10 @@ std::set<std::string> SettingsBackend::GetKnownExtensionIDs() const {
|
| }
|
|
|
| // Leveldb databases are directories inside base_path_.
|
| - file_util::FileEnumerator::FindInfo find_info;
|
| - file_util::FileEnumerator extension_dirs(
|
| - base_path_, false, file_util::FileEnumerator::DIRECTORIES);
|
| + base::FileEnumerator extension_dirs(
|
| + base_path_, false, base::FileEnumerator::DIRECTORIES);
|
| while (!extension_dirs.Next().empty()) {
|
| - extension_dirs.GetFindInfo(&find_info);
|
| - base::FilePath extension_dir(
|
| - file_util::FileEnumerator::GetFilename(find_info));
|
| + base::FilePath extension_dir = extension_dirs.GetInfo().GetName();
|
| DCHECK(!extension_dir.IsAbsolute());
|
| // Extension IDs are created as std::strings so they *should* be ASCII.
|
| std::string maybe_as_ascii(extension_dir.MaybeAsASCII());
|
|
|