diff options
Diffstat (limited to 'chrome/installer/setup/setup_util.cc')
| -rw-r--r-- | chrome/installer/setup/setup_util.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc index 8b94c01..9f112c0 100644 --- a/chrome/installer/setup/setup_util.cc +++ b/chrome/installer/setup/setup_util.cc @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "base/file_util.h" -#include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/logging.h" #include "base/process_util.h" @@ -125,8 +124,8 @@ int ApplyDiffPatch(const base::FilePath& src, Version* GetMaxVersionFromArchiveDir(const base::FilePath& chrome_path) { VLOG(1) << "Looking for Chrome version folder under " << chrome_path.value(); Version* version = NULL; - base::FileEnumerator version_enum(chrome_path, false, - base::FileEnumerator::DIRECTORIES); + file_util::FileEnumerator version_enum(chrome_path, false, + file_util::FileEnumerator::DIRECTORIES); // TODO(tommi): The version directory really should match the version of // setup.exe. To begin with, we should at least DCHECK that that's true. @@ -134,11 +133,12 @@ Version* GetMaxVersionFromArchiveDir(const base::FilePath& chrome_path) { bool version_found = false; while (!version_enum.Next().empty()) { - base::FileEnumerator::FileInfo find_data = version_enum.GetInfo(); - VLOG(1) << "directory found: " << find_data.GetName().value(); + file_util::FileEnumerator::FindInfo find_data = {0}; + version_enum.GetFindInfo(&find_data); + VLOG(1) << "directory found: " << find_data.cFileName; scoped_ptr<Version> found_version( - new Version(WideToASCII(find_data.GetName().value()))); + new Version(WideToASCII(find_data.cFileName))); if (found_version->IsValid() && found_version->CompareTo(*max_version.get()) > 0) { max_version.reset(found_version.release()); |