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

Broke both windows clobber and official builders' compile with this error:

771>Link:
771>     Creating library ..\..\..\build\Release\lib\gcp_portmon64.lib and
object ..\..\..\build\Release\lib\gcp_portmon64.exp
771>base.lib(path_service.obj) : fatalerror LNK1112: module machine type 'X86'
conflicts with target machine type 'x64'
771>
771>Build FAILED.

> Move FileEnumerator to its own file, do some refactoring.
> 
> It creates a class FileInfo to contain the details rather than using a platform-specific typedef. This allows the accessors GetName, GetSize, etc. to be moved directly to this class (previously they were static helpers on the FileEnumerator class) which makes a bunch of code much cleaner. It also gives reasonable getting and initialization which the previous version lacked.
> 
> BUG=175002
> R=rvargas@chromium.org
> 
> Review URL: https://codereview.chromium.org/13165005

TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/14824006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198850 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 41 insertions, 36 deletions

diff --git a/webkit/fileapi/file_system_database_test_helper.cc b/webkit/fileapi/file_system_database_test_helper.cc
index 2c711f5..a8da1a7 100644
--- a/webkit/fileapi/file_system_database_test_helper.cc
+++ b/webkit/fileapi/file_system_database_test_helper.cc
@@ -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 @@ 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;
@@ -81,8 +81,9 @@ void CorruptDatabase(const base::FilePath& db_path,
 
 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;
diff --git a/webkit/fileapi/file_system_directory_database.cc b/webkit/fileapi/file_system_directory_database.cc
index 8ee3ada..95bd88f 100644
--- a/webkit/fileapi/file_system_directory_database.cc
+++ b/webkit/fileapi/file_system_directory_database.cc
@@ -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 @@ bool DatabaseCheckHelper::ScanDirectory() {
     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 @@ bool DatabaseCheckHelper::ScanDirectory() {
                     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;
       }
diff --git a/webkit/fileapi/file_system_origin_database.cc b/webkit/fileapi/file_system_origin_database.cc
index 5a1caea..6853587 100644
--- a/webkit/fileapi/file_system_origin_database.cc
+++ b/webkit/fileapi/file_system_origin_database.cc
@@ -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 @@ bool FileSystemOriginDatabase::RepairDatabase(const std::string& db_path) {
 
   // 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());
diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc
index 92b9f8c..7452a31 100644
--- a/webkit/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/fileapi/isolated_file_util_unittest.cc
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -29,6 +28,8 @@
 #include "webkit/fileapi/native_file_util.h"
 #include "webkit/fileapi/test_file_set.h"
 
+using file_util::FileEnumerator;
+
 namespace fileapi {
 
 namespace {
@@ -364,17 +365,18 @@ TEST_F(IsolatedFileUtilTest, ReadDirectoryTest) {
     EntryMap expected_entry_map;
 
     base::FilePath dir_path = GetTestCasePlatformPath(test_case.path);
-    base::FileEnumerator file_enum(
+    FileEnumerator file_enum(
         dir_path, false /* not recursive */,
-        base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
+        FileEnumerator::FILES | FileEnumerator::DIRECTORIES);
     base::FilePath current;
     while (!(current = file_enum.Next()).empty()) {
-      base::FileEnumerator::FileInfo file_info = file_enum.GetInfo();
+      FileEnumerator::FindInfo file_info;
+      file_enum.GetFindInfo(&file_info);
       base::FileUtilProxy::Entry entry;
-      entry.is_directory = file_info.IsDirectory();
+      entry.is_directory = FileEnumerator::IsDirectory(file_info);
       entry.name = current.BaseName().value();
-      entry.size = file_info.GetSize();
-      entry.last_modified_time = file_info.GetLastModifiedTime();
+      entry.size = FileEnumerator::GetFilesize(file_info);
+      entry.last_modified_time = FileEnumerator::GetLastModifiedTime(file_info);
       expected_entry_map[entry.name] = entry;
 
 #if defined(OS_POSIX)
diff --git a/webkit/fileapi/local_file_util.cc b/webkit/fileapi/local_file_util.cc
index 645856c..4760423 100644
--- a/webkit/fileapi/local_file_util.cc
+++ b/webkit/fileapi/local_file_util.cc
@@ -4,7 +4,6 @@
 
 #include "webkit/fileapi/local_file_util.h"
 
-#include "base/files/file_enumerator.h"
 #include "base/files/file_util_proxy.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_context.h"
@@ -40,8 +39,8 @@ class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
   virtual bool IsDirectory() OVERRIDE;
 
  private:
-  base::FileEnumerator file_enum_;
-  base::FileEnumerator::FileInfo file_util_info_;
+  file_util::FileEnumerator file_enum_;
+  file_util::FileEnumerator::FindInfo file_util_info_;
   base::FilePath platform_root_path_;
   base::FilePath virtual_root_path_;
 };
@@ -53,7 +52,7 @@ base::FilePath LocalFileEnumerator::Next() {
     next = file_enum_.Next();
   if (next.empty())
     return next;
-  file_util_info_ = file_enum_.GetInfo();
+  file_enum_.GetFindInfo(&file_util_info_);
 
   base::FilePath path;
   platform_root_path_.AppendRelativePath(next, &path);
@@ -61,15 +60,15 @@ base::FilePath LocalFileEnumerator::Next() {
 }
 
 int64 LocalFileEnumerator::Size() {
-  return file_util_info_.GetSize();
+  return file_util::FileEnumerator::GetFilesize(file_util_info_);
 }
 
 base::Time LocalFileEnumerator::LastModifiedTime() {
-  return file_util_info_.GetLastModifiedTime();
+  return file_util::FileEnumerator::GetLastModifiedTime(file_util_info_);
 }
 
 bool LocalFileEnumerator::IsDirectory() {
-  return file_util_info_.IsDirectory();
+  return file_util::FileEnumerator::IsDirectory(file_util_info_);
 }
 
 LocalFileUtil::LocalFileUtil() {
@@ -152,7 +151,8 @@ scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> LocalFileUtil::
   }
   return make_scoped_ptr(new LocalFileEnumerator(
       file_path, root_url.path(),
-      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES))
+      file_util::FileEnumerator::FILES |
+          file_util::FileEnumerator::DIRECTORIES))
       .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
 }
 
diff --git a/webkit/fileapi/native_file_util.cc b/webkit/fileapi/native_file_util.cc
index d9b109f..e64fa05 100644
--- a/webkit/fileapi/native_file_util.cc
+++ b/webkit/fileapi/native_file_util.cc
@@ -5,7 +5,6 @@
 #include "webkit/fileapi/native_file_util.h"
 
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/memory/scoped_ptr.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 
@@ -56,27 +55,27 @@ class NativeFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
   virtual bool IsDirectory() OVERRIDE;
 
  private:
-  base::FileEnumerator file_enum_;
-  base::FileEnumerator::FileInfo file_util_info_;
+  file_util::FileEnumerator file_enum_;
+  file_util::FileEnumerator::FindInfo file_util_info_;
 };
 
 base::FilePath NativeFileEnumerator::Next() {
   base::FilePath rv = file_enum_.Next();
   if (!rv.empty())
-    file_util_info_ = file_enum_.GetInfo();
+    file_enum_.GetFindInfo(&file_util_info_);
   return rv;
 }
 
 int64 NativeFileEnumerator::Size() {
-  return file_util_info_.GetSize();
+  return file_util::FileEnumerator::GetFilesize(file_util_info_);
 }
 
 base::Time NativeFileEnumerator::LastModifiedTime() {
-  return file_util_info_.GetLastModifiedTime();
+  return file_util::FileEnumerator::GetLastModifiedTime(file_util_info_);
 }
 
 bool NativeFileEnumerator::IsDirectory() {
-  return file_util_info_.IsDirectory();
+  return file_util::FileEnumerator::IsDirectory(file_util_info_);
 }
 
 PlatformFileError NativeFileUtil::CreateOrOpen(
@@ -164,7 +163,8 @@ scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
                                          bool recursive) {
   return make_scoped_ptr(new NativeFileEnumerator(
       root_path, recursive,
-      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES))
+      file_util::FileEnumerator::FILES |
+          file_util::FileEnumerator::DIRECTORIES))
       .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
 }