Move FileEnumerator to its own file, do some refactoring.

webkit/browser/database/database_tracker.cc

Index: webkit/browser/database/database_tracker.cc
diff --git a/webkit/browser/database/database_tracker.cc b/webkit/browser/database/database_tracker.cc
index 25675399a17e5d37697aad70027cc9f0505bf53c..285118e6d8eda532af3b6f51eed1838a6686aa6c 100644
--- a/webkit/browser/database/database_tracker.cc
+++ b/webkit/browser/database/database_tracker.cc
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/strings/string_number_conversions.h"
@@ -414,10 +415,10 @@ bool DatabaseTracker::DeleteOrigin(const base::string16& origin_identifier,
   file_util::CreateTemporaryDirInDir(db_dir_,
                                      kTemporaryDirectoryPrefix,
                                      &new_origin_dir);
-  file_util::FileEnumerator databases(
+  base::FileEnumerator databases(
       origin_dir,
       false,
-      file_util::FileEnumerator::FILES);
+      base::FileEnumerator::FILES);
   for (base::FilePath database = databases.Next(); !database.empty();
        database = databases.Next()) {
     base::FilePath new_file = new_origin_dir.Append(database.BaseName());
@@ -459,10 +460,10 @@ bool DatabaseTracker::LazyInit() {
     // If there are left-over directories from failed deletion attempts, clean
     // them up.
     if (file_util::DirectoryExists(db_dir_)) {
-      file_util::FileEnumerator directories(
+      base::FileEnumerator directories(
           db_dir_,
           false,
-          file_util::FileEnumerator::DIRECTORIES,
+          base::FileEnumerator::DIRECTORIES,
           kTemporaryDirectoryPattern);
       for (base::FilePath directory = directories.Next(); !directory.empty();
            directory = directories.Next()) {