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

trunk/src/webkit/fileapi/file_system_database_test_helper.cc

Index: trunk/src/webkit/fileapi/file_system_database_test_helper.cc
===================================================================
--- trunk/src/webkit/fileapi/file_system_database_test_helper.cc	(revision 198849)
+++ trunk/src/webkit/fileapi/file_system_database_test_helper.cc	(working copy)
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/stl_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_util.h"
@@ -20,8 +19,9 @@
                      leveldb::FileType type,
                      ptrdiff_t offset,
                      size_t size) {
-  base::FileEnumerator file_enum(db_path, false /* not recursive */,
-      base::FileEnumerator::DIRECTORIES | base::FileEnumerator::FILES);
+  file_util::FileEnumerator file_enum(db_path, false /* not recursive */,
+      file_util::FileEnumerator::DIRECTORIES |
+      file_util::FileEnumerator::FILES);
   base::FilePath file_path;
   base::FilePath picked_file_path;
   uint64 picked_file_number = kuint64max;
@@ -81,8 +81,9 @@
 
 void DeleteDatabaseFile(const base::FilePath& db_path,
                         leveldb::FileType type) {
-  base::FileEnumerator file_enum(db_path, false /* not recursive */,
-      base::FileEnumerator::DIRECTORIES | base::FileEnumerator::FILES);
+  file_util::FileEnumerator file_enum(db_path, false /* not recursive */,
+      file_util::FileEnumerator::DIRECTORIES |
+      file_util::FileEnumerator::FILES);
   base::FilePath file_path;
   while (!(file_path = file_enum.Next()).empty()) {
     uint64 number = kuint64max;