Revert 198820 "Move FileEnumerator to its own file, do some refa..."

trunk/src/chrome/test/mini_installer_test/installer_path_provider.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/test/mini_installer_test/installer_path_provider.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/files/file_enumerator.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
 #include "chrome/test/mini_installer_test/installer_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 struct FilePathInfo {
-  base::FileEnumerator::FileInfo info;
+  file_util::FileEnumerator::FindInfo info;
   base::FilePath path;
 };
 
-bool CompareDate(const FilePathInfo& a, const FilePathInfo& b) {
-  return a.info.GetLastModifiedTime() > b.info.GetLastModifiedTime();
+bool CompareDate(const FilePathInfo& a,
+                 const FilePathInfo& b) {
+#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
 }
 
 // Get list of file |type| matching |pattern| in |root|.
 // The list is sorted in last modified date order.
 // Return true if files/directories are found.
 bool FindMatchingFiles(const base::FilePath& root,
                        const std::string& pattern,
-                       base::FileEnumerator::FileType type,
+                       file_util::FileEnumerator::FileType type,
                        std::vector<base::FilePath>* paths) {
-  base::FileEnumerator files(root, false, type,
+  file_util::FileEnumerator files(root, false, type,
       base::FilePath().AppendASCII(pattern).value());
   std::vector<FilePathInfo> matches;
   for (base::FilePath current = files.Next(); !current.empty();
       current = files.Next()) {
     FilePathInfo entry;
-    entry.info = files.GetInfo();
+    files.GetFindInfo(&entry.info);
     entry.path = current;
     matches.push_back(entry);
   }
 
   if (matches.empty())
     return false;
 
   std::sort(matches.begin(), matches.end(), CompareDate);
   std::vector<FilePathInfo>::iterator current;
   for (current = matches.begin(); current != matches.end(); ++current) {
     paths->push_back(current->path);
   }
   return true;
 }
 
 bool FindNewestMatchingFile(const base::FilePath& root,
                             const std::string& pattern,
-                            base::FileEnumerator::FileType type,
+                            file_util::FileEnumerator::FileType type,
                             base::FilePath* path) {
   std::vector<base::FilePath> paths;
   if (FindMatchingFiles(root, pattern, type, &paths)) {
     *path = paths[0];
     return true;
   }
   return false;
 }
 
 }  // namespace
@@ skipping 53 matching lines @@
     return false;
 
   base::FilePath previous_installer;
   std::vector<std::string> tokenized_name;
   Tokenize(diff_installer.BaseName().MaybeAsASCII(),
       "_", &tokenized_name);
   std::string build_pattern = base::StringPrintf(
       "*%s", tokenized_name[2].c_str());
   std::vector<base::FilePath> previous_build;
   if (FindMatchingFiles(diff_installer.DirName().DirName().DirName(),
-      build_pattern, base::FileEnumerator::DIRECTORIES,
+      build_pattern, file_util::FileEnumerator::DIRECTORIES,
       &previous_build)) {
     base::FilePath windir = previous_build.at(0).Append(
         mini_installer_constants::kWinFolder);
     FindNewestMatchingFile(windir, full_installer_pattern,
-        base::FileEnumerator::FILES, &previous_installer);
+        file_util::FileEnumerator::FILES, &previous_installer);
   }
 
   if (previous_installer.empty())
     return false;
   *path = previous_installer;
   return true;
 }
 
 bool InstallerPathProvider::GetStandaloneInstaller(base::FilePath* path) {
   // Get standalone installer.
@@ skipping 45 matching lines @@
   return path;
 }
 
 bool InstallerPathProvider::GetInstaller(const std::string& pattern,
                                          base::FilePath* path) {
   base::FilePath installer;
   // Search filer for installer binary.
   base::FilePath root(mini_installer_constants::kChromeInstallersLocation);
   std::vector<base::FilePath> paths;
   if (!FindMatchingFiles(root, current_build_,
-                         base::FileEnumerator::DIRECTORIES, &paths)) {
+      file_util::FileEnumerator::DIRECTORIES, &paths)) {
     return false;
   }
 
   std::vector<base::FilePath>::const_iterator dir;
   for (dir = paths.begin(); dir != paths.end(); ++dir) {
     base::FilePath windir = dir->Append(
         mini_installer_constants::kWinFolder);
-    if (FindNewestMatchingFile(windir, pattern, base::FileEnumerator::FILES,
-                               &installer)) {
+    if (FindNewestMatchingFile(windir, pattern,
+            file_util::FileEnumerator::FILES, &installer)) {
       break;
     }
   }
 
   if (installer.empty()) {
     LOG(WARNING) << "Failed to find installer with pattern: " << pattern;
     return false;
   }
 
   *path = installer;
   return true;
 }
 
 std::string InstallerPathProvider::GetCurrentBuild() {
   return current_build_;
 }
 
 std::string InstallerPathProvider::GetPreviousBuild() {
   return previous_build_;
 }
 
 }  // namespace