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

trunk/src/webkit/fileapi/file_system_directory_database.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_directory_database.h"
 
 #include <math.h>
 #include <algorithm>
 #include <set>
 #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"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 
@@ skipping 251 matching lines @@
   };
 
   // Any path in |pending_directories| is relative to |path_|.
   std::stack<base::FilePath> pending_directories;
   pending_directories.push(base::FilePath());
 
   while (!pending_directories.empty()) {
     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;
 
       if (std::find(kExcludes, kExcludes + arraysize(kExcludes),
                     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;
       }
 
       // Check if the file has a database entry.
       std::set<base::FilePath>::iterator itr = files_in_db_.find(relative_file_path);
       if (itr == files_in_db_.end()) {
         if (!file_util::Delete(absolute_file_path, false))
           return false;
       } else {
@@ skipping 599 matching lines @@
 
 void FileSystemDirectoryDatabase::HandleError(
     const tracked_objects::Location& from_here,
     const leveldb::Status& status) {
   LOG(ERROR) << "FileSystemDirectoryDatabase failed at: "
              << from_here.ToString() << " with error: " << status.ToString();
   db_.reset();
 }
 
 }  // namespace fileapi