Move FileEnumerator to its own file, do some refactoring.

chrome/browser/media_galleries/fileapi/native_media_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 "chrome/browser/media_galleries/fileapi/native_media_file_util.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/string_util.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h"
 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_sniffer.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_task_runners.h"
@@ skipping 505 matching lines @@
   base::FilePath platform_path;
   base::PlatformFileError error = GetFileInfoSync(context, url, &file_info,
                                                   &platform_path);
 
   if (error != base::PLATFORM_FILE_OK)
     return error;
 
   if (!file_info.is_directory)
     return base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY;
 
-  file_util::FileEnumerator file_enum(
+  base::FileEnumerator file_enum(
       platform_path,
       false /* recursive */,
-      file_util::FileEnumerator::FILES |
-          file_util::FileEnumerator::DIRECTORIES);
-  file_util::FileEnumerator::FindInfo file_util_info;
-#if defined(OS_WIN)
-  memset(&file_util_info, 0, sizeof(file_util_info));
-#endif  // defined(OS_WIN)
-
+      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
   for (base::FilePath platform_path = file_enum.Next();
        !platform_path.empty();
        platform_path = file_enum.Next()) {
     // Skip symlinks.
     if (file_util::IsLink(platform_path))
       continue;
 
-    file_enum.GetFindInfo(&file_util_info);
+    base::FileEnumerator::FileInfo info = file_enum.GetInfo();
 
     // NativeMediaFileUtil skip criteria.
     if (ShouldSkip(platform_path))
       continue;
-    if (!file_util::FileEnumerator::IsDirectory(file_util_info) &&
+    if (!info.IsDirectory() &&
         !GetMediaPathFilter(context)->Match(platform_path))
       continue;
 
     fileapi::DirectoryEntry entry;
-    entry.is_directory = file_util::FileEnumerator::IsDirectory(file_util_info);
+    entry.is_directory = info.IsDirectory();
     entry.name = platform_path.BaseName().value();
-    entry.size = file_util::FileEnumerator::GetFilesize(file_util_info);
-    entry.last_modified_time =
-        file_util::FileEnumerator::GetLastModifiedTime(file_util_info);
+    entry.size = info.GetSize();
+    entry.last_modified_time = info.GetLastModifiedTime();
 
     file_list->push_back(entry);
   }
 
   return base::PLATFORM_FILE_OK;
 }
 
 base::PlatformFileError NativeMediaFileUtil::DeleteDirectorySync(
     fileapi::FileSystemOperationContext* context,
     const fileapi::FileSystemURL& url) {
@@ skipping 64 matching lines @@
   if (!file_info.is_directory &&
       !GetMediaPathFilter(context)->Match(file_path)) {
     return failure_error;
   }
 
   *local_file_path = file_path;
   return base::PLATFORM_FILE_OK;
 }
 
 }  // namespace chrome