Move FileEnumerator to its own file, do some refactoring.

net/base/directory_lister.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 "net/base/directory_lister.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
+#include "base/files/file_enumerator.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/worker_pool.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
 namespace {
 
 const int kFilesPerEvent = 8;
 
 bool IsDotDot(const base::FilePath& path) {
   return FILE_PATH_LITERAL("..") == path.BaseName().value();
 }
 
 // Comparator for sorting lister results. This uses the locale aware filename
 // comparison function on the filenames for sorting in the user's locale.
 // Static.
 bool CompareAlphaDirsFirst(const DirectoryLister::DirectoryListerData& a,
                            const DirectoryLister::DirectoryListerData& b) {
   // Parent directory before all else.
-  if (IsDotDot(file_util::FileEnumerator::GetFilename(a.info)))
+  if (IsDotDot(a.info.GetName()))
     return true;
-  if (IsDotDot(file_util::FileEnumerator::GetFilename(b.info)))
+  if (IsDotDot(b.info.GetName()))
     return false;
 
   // Directories before regular files.
-  bool a_is_directory = file_util::FileEnumerator::IsDirectory(a.info);
-  bool b_is_directory = file_util::FileEnumerator::IsDirectory(b.info);
+  bool a_is_directory = a.info.IsDirectory();
+  bool b_is_directory = b.info.IsDirectory();
   if (a_is_directory != b_is_directory)
     return a_is_directory;
 
-  return file_util::LocaleAwareCompareFilenames(
-      file_util::FileEnumerator::GetFilename(a.info),
-      file_util::FileEnumerator::GetFilename(b.info));
+  return file_util::LocaleAwareCompareFilenames(a.info.GetName(),
+                                                b.info.GetName());
 }
 
 bool CompareDate(const DirectoryLister::DirectoryListerData& a,
                  const DirectoryLister::DirectoryListerData& b) {
   // Parent directory before all else.
-  if (IsDotDot(file_util::FileEnumerator::GetFilename(a.info)))
+  if (IsDotDot(a.info.GetName()))
     return true;
-  if (IsDotDot(file_util::FileEnumerator::GetFilename(b.info)))
+  if (IsDotDot(b.info.GetName()))
     return false;
 
   // Directories before regular files.
-  bool a_is_directory = file_util::FileEnumerator::IsDirectory(a.info);
-  bool b_is_directory = file_util::FileEnumerator::IsDirectory(b.info);
+  bool a_is_directory = a.info.IsDirectory();
+  bool b_is_directory = b.info.IsDirectory();
   if (a_is_directory != b_is_directory)
     return a_is_directory;
-#if defined(OS_POSIX)
-  return a.info.stat.st_mtime > b.info.stat.st_mtime;
-#elif defined(OS_WIN)
-  if (a.info.ftLastWriteTime.dwHighDateTime ==
-      b.info.ftLastWriteTime.dwHighDateTime) {
-    return a.info.ftLastWriteTime.dwLowDateTime >
-           b.info.ftLastWriteTime.dwLowDateTime;
-  } else {
-    return a.info.ftLastWriteTime.dwHighDateTime >
-           b.info.ftLastWriteTime.dwHighDateTime;
-  }
-#endif
+  return a.info.GetLastModifiedTime() > b.info.GetLastModifiedTime();
 }
 
 // Comparator for sorting find result by paths. This uses the locale-aware
 // comparison function on the filenames for sorting in the user's locale.
 // Static.
 bool CompareFullPath(const DirectoryLister::DirectoryListerData& a,
                      const DirectoryLister::DirectoryListerData& b) {
   return file_util::LocaleAwareCompareFilenames(a.path, b.path);
 }
 
@@ skipping 69 matching lines @@
 
 void DirectoryLister::Core::StartInternal() {
 
   if (!file_util::DirectoryExists(dir_)) {
     origin_loop_->PostTask(
         FROM_HERE,
         base::Bind(&DirectoryLister::Core::OnDone, this, ERR_FILE_NOT_FOUND));
     return;
   }
 
-  int types = file_util::FileEnumerator::FILES |
-              file_util::FileEnumerator::DIRECTORIES;
+  int types = base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES;
   if (!recursive_)
-    types |= file_util::FileEnumerator::INCLUDE_DOT_DOT;
+    types |= base::FileEnumerator::INCLUDE_DOT_DOT;
 
-  file_util::FileEnumerator file_enum(dir_, recursive_, types);
+  base::FileEnumerator file_enum(dir_, recursive_, types);
 
   base::FilePath path;
   std::vector<DirectoryListerData> file_data;
   while (lister_ && !(path = file_enum.Next()).empty()) {
     DirectoryListerData data;
-    file_enum.GetFindInfo(&data.info);
+    data.info = file_enum.GetInfo();
     data.path = path;
     file_data.push_back(data);
 
     /* TODO(brettw) bug 24107: It would be nice to send incremental updates.
        We gather them all so they can be sorted, but eventually the sorting
        should be done from JS to give more flexibility in the page. When we do
        that, we can uncomment this to send incremental updates to the page.
 
     if (file_data.size() < kFilesPerEvent)
       continue;
@@ skipping 32 matching lines @@
 
 void DirectoryLister::OnReceivedData(const DirectoryListerData& data) {
   delegate_->OnListFile(data);
 }
 
 void DirectoryLister::OnDone(int error) {
   delegate_->OnListDone(error);
 }
 
 }  // namespace net