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

trunk/src/webkit/fileapi/native_file_util.cc

Index: trunk/src/webkit/fileapi/native_file_util.cc
===================================================================
--- trunk/src/webkit/fileapi/native_file_util.cc	(revision 198849)
+++ trunk/src/webkit/fileapi/native_file_util.cc	(working copy)
@@ -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 @@
   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 @@
                                          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>();
 }