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

chrome/installer/setup/install.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/install.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <time.h>
 
@@ skipping 168 matching lines @@
 // package. If package does not exist before calling the function
 // (typical new install), the function creates package during install
 // and removes the whole directory during rollback.
 installer::InstallStatus InstallNewVersion(
     const InstallationState& original_state,
     const InstallerState& installer_state,
     const base::FilePath& setup_path,
     const base::FilePath& archive_path,
     const base::FilePath& src_path,
     const base::FilePath& temp_path,
-    const base::Version& new_version,
-    scoped_ptr<base::Version>* current_version) {
+    const Version& new_version,
+    scoped_ptr<Version>* current_version) {
   DCHECK(current_version);
 
   installer_state.UpdateStage(installer::BUILDING);
 
   current_version->reset(installer_state.GetCurrentVersion(original_state));
   scoped_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList());
 
   AddInstallWorkItems(original_state,
                       installer_state,
                       setup_path,
@@ skipping 98 matching lines @@
 
 namespace installer {
 
 void EscapeXmlAttributeValueInSingleQuotes(base::string16* att_value) {
   base::ReplaceChars(*att_value, L"&", L"&amp;", att_value);
   base::ReplaceChars(*att_value, L"'", L"&apos;", att_value);
   base::ReplaceChars(*att_value, L"<", L"&lt;", att_value);
 }
 
 bool CreateVisualElementsManifest(const base::FilePath& src_path,
-                                  const base::Version& version) {
+                                  const Version& version) {
   // Construct the relative path to the versioned VisualElements directory.
   base::string16 elements_dir(ASCIIToUTF16(version.GetString()));
   elements_dir.push_back(base::FilePath::kSeparators[0]);
   elements_dir.append(installer::kVisualElements);
 
   // Some distributions of Chromium may not include visual elements. Only
   // proceed if this distribution does.
   if (!base::PathExists(src_path.Append(elements_dir))) {
     VLOG(1) << "No visual elements found, not writing "
             << installer::kVisualElementsManifest << " to " << src_path.value();
@@ skipping 180 matching lines @@
 
 InstallStatus InstallOrUpdateProduct(
     const InstallationState& original_state,
     const InstallerState& installer_state,
     const base::FilePath& setup_path,
     const base::FilePath& archive_path,
     const base::FilePath& install_temp_path,
     const base::FilePath& src_path,
     const base::FilePath& prefs_path,
     const MasterPreferences& prefs,
-    const base::Version& new_version) {
+    const Version& new_version) {
   DCHECK(!installer_state.products().empty());
 
   // TODO(robertshield): Removing the pending on-reboot moves should be done
   // elsewhere.
   // Remove any scheduled MOVEFILE_DELAY_UNTIL_REBOOT entries in the target of
   // this installation. These may have been added during a previous uninstall of
   // the same version.
   LOG_IF(ERROR, !RemoveFromMovesPendingReboot(installer_state.target_path()))
       << "Error accessing pending moves value.";
 
   // Create VisualElementManifest.xml in |src_path| (if required) so that it
   // looks as if it had been extracted from the archive when calling
   // InstallNewVersion() below.
   installer_state.UpdateStage(installer::CREATING_VISUAL_MANIFEST);
   CreateVisualElementsManifest(src_path, new_version);
 
-  scoped_ptr<base::Version> existing_version;
+  scoped_ptr<Version> existing_version;
   InstallStatus result = InstallNewVersion(original_state, installer_state,
       setup_path, archive_path, src_path, install_temp_path, new_version,
       &existing_version);
 
   // TODO(robertshield): Everything below this line should instead be captured
   // by WorkItems.
   if (!InstallUtil::GetInstallReturnCode(result)) {
     installer_state.UpdateStage(installer::UPDATING_CHANNELS);
 
     // Update the modifiers on the channel values for the product(s) being
@@ skipping 164 matching lines @@
   if (app_host_path.empty())
     return false;
 
   CommandLine cmd(app_host_path);
   cmd.AppendSwitchASCII(::switches::kInstallFromWebstore, app_code);
   VLOG(1) << "App install command: " << cmd.GetCommandLineString();
   return base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
 }
 
 }  // namespace installer