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

trunk/src/webkit/fileapi/file_system_database_test_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/fileapi/file_system_database_test_helper.h"
 
 #include <algorithm>
 #include <functional>
 #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"
 
 namespace fileapi {
 
 void CorruptDatabase(const base::FilePath& db_path,
                      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;
 
   while (!(file_path = file_enum.Next()).empty()) {
     uint64 number = kuint64max;
     leveldb::FileType file_type;
     EXPECT_TRUE(leveldb::ParseFileName(FilePathToString(file_path.BaseName()),
                                        &number, &file_type));
     if (file_type == type &&
@@ skipping 39 matching lines @@
   int written_size = base::WritePlatformFile(file, offset,
                                              vector_as_array(&buf), buf.size());
   EXPECT_GT(written_size, 0);
   EXPECT_EQ(buf.size(), static_cast<size_t>(written_size));
 
   base::ClosePlatformFile(file);
 }
 
 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;
     leveldb::FileType file_type;
     EXPECT_TRUE(leveldb::ParseFileName(FilePathToString(file_path.BaseName()),
                                        &number, &file_type));
     if (file_type == type) {
       file_util::Delete(file_path, false);
       // We may have multiple files for the same type, so don't break here.
     }
   }
 
 }
 
 }  // namespace fileapi