Move FileEnumerator to its own file, do some refactoring.

webkit/browser/fileapi/local_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/local_file_util.h"
 
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/files/file_util_proxy.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/native_file_util.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
 namespace fileapi {
 
 using base::PlatformFileError;
 
 class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
  public:
   LocalFileEnumerator(const base::FilePath& platform_root_path,
                       const base::FilePath& virtual_root_path,
                       int file_type)
       : file_enum_(platform_root_path, false /* recursive */, file_type),
         platform_root_path_(platform_root_path),
         virtual_root_path_(virtual_root_path) {
-#if defined(OS_WIN)
-    memset(&file_util_info_, 0, sizeof(file_util_info_));
-#endif  // defined(OS_WIN)
   }
 
   virtual ~LocalFileEnumerator() {}
 
   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 platform_root_path_;
   base::FilePath virtual_root_path_;
 };
 
 base::FilePath LocalFileEnumerator::Next() {
   base::FilePath next = file_enum_.Next();
   // Don't return symlinks.
   while (!next.empty() && file_util::IsLink(next))
     next = file_enum_.Next();
   if (next.empty())
     return next;
-  file_enum_.GetFindInfo(&file_util_info_);
+  file_util_info_ = file_enum_.GetInfo();
 
   base::FilePath path;
   platform_root_path_.AppendRelativePath(next, &path);
   return virtual_root_path_.Append(path);
 }
 
 int64 LocalFileEnumerator::Size() {
-  return file_util::FileEnumerator::GetFilesize(file_util_info_);
+  return file_util_info_.GetSize();
 }
 
 base::Time LocalFileEnumerator::LastModifiedTime() {
-  return file_util::FileEnumerator::GetLastModifiedTime(file_util_info_);
+  return file_util_info_.GetLastModifiedTime();
 }
 
 bool LocalFileEnumerator::IsDirectory() {
-  return file_util::FileEnumerator::IsDirectory(file_util_info_);
+  return file_util_info_.IsDirectory();
 }
 
 LocalFileUtil::LocalFileUtil() {
 }
 
 LocalFileUtil::~LocalFileUtil() {
 }
 
 PlatformFileError LocalFileUtil::CreateOrOpen(
     FileSystemOperationContext* context,
@@ skipping 62 matching lines @@
         FileSystemOperationContext* context,
         const FileSystemURL& root_url) {
   base::FilePath file_path;
   if (GetLocalFilePath(context, root_url, &file_path) !=
       base::PLATFORM_FILE_OK) {
     return make_scoped_ptr(new EmptyFileEnumerator)
         .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
   }
   return make_scoped_ptr(new LocalFileEnumerator(
       file_path, root_url.path(),
-      file_util::FileEnumerator::FILES |
-          file_util::FileEnumerator::DIRECTORIES))
+      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES))
       .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
 }
 
 PlatformFileError LocalFileUtil::GetLocalFilePath(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     base::FilePath* local_file_path) {
   base::FilePath root = context->root_path();
   if (root.empty())
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
@@ skipping 85 matching lines @@
     base::FilePath* platform_path) {
   DCHECK(file_info);
   // We're just returning the local file information.
   *error = GetFileInfo(context, url, file_info, platform_path);
   if (*error == base::PLATFORM_FILE_OK && file_info->is_directory)
     *error = base::PLATFORM_FILE_ERROR_NOT_A_FILE;
   return webkit_blob::ScopedFile();
 }
 
 }  // namespace fileapi