Move FileEnumerator to its own file, do some refactoring.

chrome/browser/extensions/api/storage/settings_backend.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/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"
 #include "chrome/browser/extensions/api/storage/syncable_settings_storage.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/sync_error_factory.h"
 
 using content::BrowserThread;
 
 namespace extensions {
@@ skipping 90 matching lines @@
   std::set<std::string> result;
 
   // Storage areas can be in-memory as well as on disk. |storage_objs_| will
   // contain all that are in-memory.
   for (StorageObjMap::iterator it = storage_objs_.begin();
       it != storage_objs_.end(); ++it) {
     result.insert(it->first);
   }
 
   // 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());
     if (!maybe_as_ascii.empty()) {
       result.insert(maybe_as_ascii);
     }
   }
 
   return result;
 }
@@ skipping 148 matching lines @@
 scoped_ptr<SettingsSyncProcessor> SettingsBackend::CreateSettingsSyncProcessor(
     const std::string& extension_id) const {
   CHECK(sync_processor_.get());
   return scoped_ptr<SettingsSyncProcessor>(
       new SettingsSyncProcessor(extension_id,
                                 sync_type_,
                                 sync_processor_.get()));
 }
 
 }  // namespace extensions