Move FileEnumerator to its own file, do some refactoring.

webkit/browser/fileapi/native_file_util.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/browser/fileapi/native_file_util.h"
 
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 
 namespace fileapi {
 
 namespace {
 
 // Sets permissions on directory at |dir_path| based on the target platform.
 // Returns true on success, or false otherwise.
 //
@@ skipping 17 matching lines @@
 
 using base::PlatformFile;
 using base::PlatformFileError;
 
 class NativeFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
  public:
   NativeFileEnumerator(const base::FilePath& root_path,
                        bool recursive,
                        int file_type)
     : file_enum_(root_path, recursive, file_type) {
-#if defined(OS_WIN)
-    memset(&file_util_info_, 0, sizeof(file_util_info_));
-#endif  // defined(OS_WIN)
   }
 
   virtual ~NativeFileEnumerator() {}
 
   virtual base::FilePath Next() OVERRIDE;
   virtual int64 Size() OVERRIDE;
   virtual base::Time LastModifiedTime() OVERRIDE;
   virtual bool IsDirectory() OVERRIDE;
 
  private:
-  file_util::FileEnumerator file_enum_;
-  file_util::FileEnumerator::FindInfo file_util_info_;
+  base::FileEnumerator file_enum_;
+  base::FileEnumerator::FileInfo file_util_info_;
 };
 
 base::FilePath NativeFileEnumerator::Next() {
   base::FilePath rv = file_enum_.Next();
   if (!rv.empty())
-    file_enum_.GetFindInfo(&file_util_info_);
+    file_util_info_ = file_enum_.GetInfo();
   return rv;
 }
 
 int64 NativeFileEnumerator::Size() {
-  return file_util::FileEnumerator::GetFilesize(file_util_info_);
+  return file_util_info_.GetSize();
 }
 
 base::Time NativeFileEnumerator::LastModifiedTime() {
-  return file_util::FileEnumerator::GetLastModifiedTime(file_util_info_);
+  return file_util_info_.GetLastModifiedTime();
 }
 
 bool NativeFileEnumerator::IsDirectory() {
-  return file_util::FileEnumerator::IsDirectory(file_util_info_);
+  return file_util_info_.IsDirectory();
 }
 
 PlatformFileError NativeFileUtil::CreateOrOpen(
     const base::FilePath& path, int file_flags,
     PlatformFile* file_handle, bool* created) {
   if (!file_util::DirectoryExists(path.DirName())) {
     // If its parent does not exist, should return NOT_FOUND error.
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   }
   if (file_util::DirectoryExists(path))
@@ skipping 67 matching lines @@
   if (!file_util::GetFileInfo(path, file_info))
     return base::PLATFORM_FILE_ERROR_FAILED;
   return base::PLATFORM_FILE_OK;
 }
 
 scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
     NativeFileUtil::CreateFileEnumerator(const base::FilePath& root_path,
                                          bool recursive) {
   return make_scoped_ptr(new NativeFileEnumerator(
       root_path, recursive,
-      file_util::FileEnumerator::FILES |
-          file_util::FileEnumerator::DIRECTORIES))
+      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES))
       .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
 }
 
 PlatformFileError NativeFileUtil::Touch(
     const base::FilePath& path,
     const base::Time& last_access_time,
     const base::Time& last_modified_time) {
   if (!file_util::TouchFile(
           path, last_access_time, last_modified_time))
     return base::PLATFORM_FILE_ERROR_FAILED;
@@ skipping 78 matching lines @@
   if (!file_util::DirectoryExists(path))
     return base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY;
   if (!file_util::IsDirectoryEmpty(path))
     return base::PLATFORM_FILE_ERROR_NOT_EMPTY;
   if (!file_util::Delete(path, false))
     return base::PLATFORM_FILE_ERROR_FAILED;
   return base::PLATFORM_FILE_OK;
 }
 
 }  // namespace fileapi