Revert 198820 "Move FileEnumerator to its own file, do some refa..."

trunk/src/webkit/fileapi/file_system_directory_database.cc

Index: trunk/src/webkit/fileapi/file_system_directory_database.cc
===================================================================
--- trunk/src/webkit/fileapi/file_system_directory_database.cc	(revision 198849)
+++ trunk/src/webkit/fileapi/file_system_directory_database.cc	(working copy)
@@ -10,7 +10,6 @@
 #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,13 +281,17 @@
     base::FilePath dir_path = pending_directories.top();
     pending_directories.pop();
 
-    base::FileEnumerator file_enum(
+    file_util::FileEnumerator file_enum(
         dir_path.empty() ? path_ : path_.Append(dir_path),
         false /* not recursive */,
-        base::FileEnumerator::DIRECTORIES | base::FileEnumerator::FILES);
+        file_util::FileEnumerator::DIRECTORIES |
+        file_util::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::FilePath relative_file_path;
       if (!path_.AppendRelativePath(absolute_file_path, &relative_file_path))
         return false;
@@ -297,7 +300,7 @@
                     relative_file_path) != kExcludes + arraysize(kExcludes))
         continue;
 
-      if (file_enum.GetInfo().IsDirectory()) {
+      if (file_util::FileEnumerator::IsDirectory(find_info)) {
         pending_directories.push(relative_file_path);
         continue;
       }