Move FileEnumerator to its own file, do some refactoring.

webkit/browser/fileapi/sandbox_directory_database.cc

Index: webkit/browser/fileapi/sandbox_directory_database.cc
diff --git a/webkit/browser/fileapi/sandbox_directory_database.cc b/webkit/browser/fileapi/sandbox_directory_database.cc
index 6af02ab4129d906a2b611fcebb07a9ba9f0c9e82..b5b30d81b57ed7246df911512b04d086eca5799c 100644
--- a/webkit/browser/fileapi/sandbox_directory_database.cc
+++ b/webkit/browser/fileapi/sandbox_directory_database.cc
@@ -10,6 +10,7 @@
 #include <stack>
 
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
 #include "base/pickle.h"
@@ -282,16 +283,14 @@ bool DatabaseCheckHelper::ScanDirectory() {
     base::FilePath dir_path = pending_directories.top();
     pending_directories.pop();
 
-    file_util::FileEnumerator file_enum(
+    base::FileEnumerator file_enum(
         dir_path.empty() ? path_ : path_.Append(dir_path),
         false /* not recursive */,
-        file_util::FileEnumerator::DIRECTORIES |
-        file_util::FileEnumerator::FILES);
+        base::FileEnumerator::DIRECTORIES | base::FileEnumerator::FILES);
 
     base::FilePath absolute_file_path;
     while (!(absolute_file_path = file_enum.Next()).empty()) {
-      file_util::FileEnumerator::FindInfo find_info;
-      file_enum.GetFindInfo(&find_info);
+      base::FileEnumerator::FileInfo find_info = file_enum.GetInfo();
 
       base::FilePath relative_file_path;
       if (!path_.AppendRelativePath(absolute_file_path, &relative_file_path))
@@ -301,7 +300,7 @@ bool DatabaseCheckHelper::ScanDirectory() {
                     relative_file_path) != kExcludes + arraysize(kExcludes))
         continue;
 
-      if (file_util::FileEnumerator::IsDirectory(find_info)) {
+      if (find_info.IsDirectory()) {
         pending_directories.push(relative_file_path);
         continue;
       }