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

trunk/src/webkit/fileapi/file_system_origin_database.cc

Index: trunk/src/webkit/fileapi/file_system_origin_database.cc
===================================================================
--- trunk/src/webkit/fileapi/file_system_origin_database.cc	(revision 198849)
+++ trunk/src/webkit/fileapi/file_system_origin_database.cc	(working copy)
@@ -7,7 +7,6 @@
 #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"
@@ -134,9 +133,9 @@
 
   // See if the repaired entries match with what we have on disk.
   std::set<base::FilePath> directories;
-  base::FileEnumerator file_enum(file_system_directory_,
-                                 false /* recursive */,
-                                 base::FileEnumerator::DIRECTORIES);
+  file_util::FileEnumerator file_enum(file_system_directory_,
+                                      false /* recursive */,
+                                      file_util::FileEnumerator::DIRECTORIES);
   base::FilePath path_each;
   while (!(path_each = file_enum.Next()).empty())
     directories.insert(path_each.BaseName());