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

Reland of 198820 and 298824
Original review = https://codereview.chromium.org/13165005
R=rvargas@chromium.org

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

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

1 files changed, 7 insertions, 9 deletions

diff --git a/webkit/browser/fileapi/isolated_file_util_unittest.cc b/webkit/browser/fileapi/isolated_file_util_unittest.cc
index dfedabd..cd07bc9 100644
--- a/webkit/browser/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/browser/fileapi/isolated_file_util_unittest.cc
@@ -9,6 +9,7 @@
 #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"
@@ -27,8 +28,6 @@
 #include "webkit/browser/fileapi/native_file_util.h"
 #include "webkit/browser/fileapi/test_file_set.h"
 
-using file_util::FileEnumerator;
-
 namespace fileapi {
 
 namespace {
@@ -363,18 +362,17 @@ TEST_F(IsolatedFileUtilTest, ReadDirectoryTest) {
     EntryMap expected_entry_map;
 
     base::FilePath dir_path = GetTestCasePlatformPath(test_case.path);
-    FileEnumerator file_enum(
+    base::FileEnumerator file_enum(
         dir_path, false /* not recursive */,
-        FileEnumerator::FILES | FileEnumerator::DIRECTORIES);
+        base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
     base::FilePath current;
     while (!(current = file_enum.Next()).empty()) {
-      FileEnumerator::FindInfo file_info;
-      file_enum.GetFindInfo(&file_info);
+      base::FileEnumerator::FileInfo file_info = file_enum.GetInfo();
       DirectoryEntry entry;
-      entry.is_directory = FileEnumerator::IsDirectory(file_info);
+      entry.is_directory = file_info.IsDirectory();
       entry.name = current.BaseName().value();
-      entry.size = FileEnumerator::GetFilesize(file_info);
-      entry.last_modified_time = FileEnumerator::GetLastModifiedTime(file_info);
+      entry.size = file_info.GetSize();
+      entry.last_modified_time = file_info.GetLastModifiedTime();
       expected_entry_map[entry.name] = entry;
 
 #if defined(OS_POSIX)