Index: chrome/installer/setup/setup_main.cc |
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc |
index 71e9a01b242530a3dc02accf936a9b6c984567f6..fa258abc65eaeacbad63109ace978903c3c116fa 100644 |
--- a/chrome/installer/setup/setup_main.cc |
+++ b/chrome/installer/setup/setup_main.cc |
@@ -291,7 +291,7 @@ installer::InstallStatus RenameChromeExecutables( |
// the proper installer result has been written to the registry. |
bool CheckGroupPolicySettings(const InstallationState& original_state, |
const InstallerState& installer_state, |
- const base::Version& new_version, |
+ const Version& new_version, |
installer::InstallStatus* status) { |
#if !defined(GOOGLE_CHROME_BUILD) |
// Chromium builds are not updated via Google Update, so there are no |
@@ -951,7 +951,7 @@ installer::InstallStatus RegisterDevChrome( |
scoped_ptr<WorkItemList> delegate_execute_list( |
WorkItem::CreateWorkItemList()); |
installer::AddDelegateExecuteWorkItems( |
- installer_state, chrome_exe.DirName(), base::Version(), chrome, |
+ installer_state, chrome_exe.DirName(), Version(), chrome, |
delegate_execute_list.get()); |
delegate_execute_list->Do(); |
if (ShellUtil::CanMakeChromeDefaultUnattended()) { |
@@ -1174,7 +1174,7 @@ bool HandleNonInstallCmdLineOptions(const InstallationState& original_state, |
BrowserDistribution* browser_dist = product.distribution(); |
// We started as system-level and have been re-launched as user level |
// to continue with the toast experiment. |
- base::Version installed_version; |
+ Version installed_version; |
InstallUtil::GetChromeVersion(browser_dist, true, &installed_version); |
if (!installed_version.IsValid()) { |
LOG(ERROR) << "No installation of " |
@@ -1463,7 +1463,7 @@ InstallStatus InstallProductsHelper( |
VLOG(1) << "unpacked to " << unpack_path.value(); |
base::FilePath src_path( |
unpack_path.Append(kInstallSourceChromeDir)); |
- scoped_ptr<base::Version> |
+ scoped_ptr<Version> |
installer_version(GetMaxVersionFromArchiveDir(src_path)); |
if (!installer_version.get()) { |
LOG(ERROR) << "Did not find any valid version in installer."; |