Move FileEnumerator to its own file, do some refactoring.

webkit/fileapi/file_system_origin_database.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 "webkit/fileapi/file_system_origin_database.h"
 
 #include <set>
 
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/format_macros.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 #include "webkit/fileapi/file_system_util.h"
@@ skipping 106 matching lines @@
 bool FileSystemOriginDatabase::RepairDatabase(const std::string& db_path) {
   DCHECK(!db_.get());
   if (!leveldb::RepairDB(db_path, leveldb::Options()).ok() ||
       !Init(FAIL_ON_CORRUPTION)) {
     LOG(WARNING) << "Failed to repair FileSystemOriginDatabase.";
     return false;
   }
 
   // See if the repaired entries match with what we have on disk.
   std::set<base::FilePath> directories;
-  file_util::FileEnumerator file_enum(file_system_directory_,
-                                      false /* recursive */,
-                                      file_util::FileEnumerator::DIRECTORIES);
+  base::FileEnumerator file_enum(file_system_directory_,
+                                 false /* recursive */,
+                                 base::FileEnumerator::DIRECTORIES);
   base::FilePath path_each;
   while (!(path_each = file_enum.Next()).empty())
     directories.insert(path_each.BaseName());
   std::set<base::FilePath>::iterator db_dir_itr =
       directories.find(base::FilePath(kOriginDatabaseName));
   // Make sure we have the database file in its directory and therefore we are
   // working on the correct path.
   DCHECK(db_dir_itr != directories.end());
   directories.erase(db_dir_itr);
 
@@ skipping 175 matching lines @@
       db_->Put(leveldb::WriteOptions(), LastPathKey(), std::string("-1"));
   if (!status.ok()) {
     HandleError(FROM_HERE, status);
     return false;
   }
   *number = -1;
   return true;
 }
 
 }  // namespace fileapi