Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea…

chrome/installer/setup/setup_main.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/installer/setup/setup_main.h"
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 273 matching lines @@
 // For each product that is being updated (i.e., already installed at an earlier
 // version), see if that product has an update policy override that differs from
 // that for the binaries.  If any are found, fail with an error indicating that
 // the Group Policy settings are in an inconsistent state.  Do not do this test
 // for same-version installs, since it would be unkind to block attempts to
 // repair a corrupt installation.  This function returns false when installation
 // should be halted, in which case |status| contains the relevant exit code and
 // 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
   // Group Policy settings to consult.
   return true;
 #else
   DCHECK(status);
 
   // Single installs are always in good shape.
   if (!installer_state.is_multi_install())
@@ skipping 639 matching lines @@
     shortcut_properties.set_dual_mode(true);
     shortcut_properties.set_pin_to_taskbar(true);
     ShellUtil::CreateOrUpdateShortcut(
         ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR, chrome_dist,
         shortcut_properties, ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS);
 
     // Register Chrome at user-level and make it default.
     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()) {
       ShellUtil::MakeChromeDefault(
           chrome_dist, ShellUtil::CURRENT_USER, chrome_exe.value(), true);
     } else {
       ShellUtil::ShowMakeChromeDefaultSystemUI(chrome_dist, chrome_exe.value());
     }
   } else {
     LOG(ERROR) << "Path not found: " << chrome_exe.value();
@@ skipping 202 matching lines @@
       }
     }
   } else if (cmd_line.HasSwitch(installer::switches::kSystemLevelToast)) {
     const Products& products = installer_state->products();
     for (Products::const_iterator it = products.begin(); it < products.end();
          ++it) {
       const Product& product = **it;
       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 "
                    << browser_dist->GetDisplayName()
                    << " found for system-level toast.";
       } else {
         product.LaunchUserExperiment(
             cmd_line.GetProgram(), installer::REENTRY_SYS_UPDATE, true);
       }
     }
@@ skipping 268 matching lines @@
     installer_state.WriteInstallerResult(
         UNCOMPRESSION_FAILED,
         IDS_INSTALL_UNCOMPRESSION_FAILED_BASE,
         NULL);
     return UNCOMPRESSION_FAILED;
   }
 
   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.";
     install_status = INVALID_ARCHIVE;
     installer_state.WriteInstallerResult(install_status,
         IDS_INSTALL_INVALID_ARCHIVE_BASE, NULL);
   } else {
     VLOG(1) << "version to install: " << installer_version->GetString();
     bool proceed_with_installation = true;
 
@@ skipping 328 matching lines @@
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
   }
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }