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

chrome/installer/setup/setup_util_unittest.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_util_unittest.h"
 
 #include <windows.h>
 
 #include <string>
 
@@ skipping 84 matching lines @@
 }
 
 }  // namespace
 
 // Test that we are parsing Chrome version correctly.
 TEST_F(SetupUtilTestWithDir, GetMaxVersionFromArchiveDirTest) {
   // Create a version dir
   base::FilePath chrome_dir = test_dir_.path().AppendASCII("1.0.0.0");
   base::CreateDirectory(chrome_dir);
   ASSERT_TRUE(base::PathExists(chrome_dir));
-  scoped_ptr<base::Version> version(
+  scoped_ptr<Version> version(
       installer::GetMaxVersionFromArchiveDir(test_dir_.path()));
   ASSERT_EQ(version->GetString(), "1.0.0.0");
 
   base::DeleteFile(chrome_dir, true);
   ASSERT_FALSE(base::PathExists(chrome_dir));
   ASSERT_TRUE(installer::GetMaxVersionFromArchiveDir(test_dir_.path()) == NULL);
 
   chrome_dir = test_dir_.path().AppendASCII("ABC");
   base::CreateDirectory(chrome_dir);
   ASSERT_TRUE(base::PathExists(chrome_dir));
@@ skipping 152 matching lines @@
  protected:
   class FakeInstallationState : public installer::InstallationState {
   };
 
   class FakeProductState : public installer::ProductState {
    public:
     static FakeProductState* FromProductState(const ProductState* product) {
       return static_cast<FakeProductState*>(const_cast<ProductState*>(product));
     }
 
-    void set_version(const base::Version& version) {
+    void set_version(const Version& version) {
       if (version.IsValid())
-        version_.reset(new base::Version(version));
+        version_.reset(new Version(version));
       else
         version_.reset();
     }
 
     void set_uninstall_command(const CommandLine& uninstall_command) {
       uninstall_command_ = uninstall_command;
     }
   };
 
   virtual void SetUp() OVERRIDE {
     SetupUtilTestWithDir::SetUp();
-    product_version_ = base::Version("30.0.1559.0");
-    max_version_ = base::Version("47.0.1559.0");
+    product_version_ = Version("30.0.1559.0");
+    max_version_ = Version("47.0.1559.0");
 
     // Install the product according to the version.
     original_state_.reset(new FakeInstallationState());
     InstallProduct();
 
     // Prepare to update the product in the temp dir.
     installer_state_.reset(new installer::InstallerState(
         kSystemInstall_ ? installer::InstallerState::SYSTEM_LEVEL :
         installer::InstallerState::USER_LEVEL));
     installer_state_->AddProductFromState(
         kProductType_,
         *original_state_->GetProductState(kSystemInstall_, kProductType_));
 
     // Create archives in the two version dirs.
     ASSERT_TRUE(
         base::CreateDirectory(GetProductVersionArchivePath().DirName()));
     ASSERT_EQ(1, file_util::WriteFile(GetProductVersionArchivePath(), "a", 1));
     ASSERT_TRUE(
         base::CreateDirectory(GetMaxVersionArchivePath().DirName()));
     ASSERT_EQ(1, file_util::WriteFile(GetMaxVersionArchivePath(), "b", 1));
   }
 
   virtual void TearDown() OVERRIDE {
     original_state_.reset();
     SetupUtilTestWithDir::TearDown();
   }
 
-  base::FilePath GetArchivePath(const base::Version& version) const {
+  base::FilePath GetArchivePath(const Version& version) const {
     return test_dir_.path()
         .AppendASCII(version.GetString())
         .Append(installer::kInstallerDir)
         .Append(installer::kChromeArchive);
   }
 
   base::FilePath GetMaxVersionArchivePath() const {
     return GetArchivePath(max_version_);
   }
 
@@ skipping 12 matching lines @@
         .Append(installer::kInstallerDir)
         .Append(installer::kSetupExe));
     uninstall_command.AppendSwitch(installer::switches::kUninstall);
     product->set_uninstall_command(uninstall_command);
   }
 
   void UninstallProduct() {
     FakeProductState::FromProductState(
         original_state_->GetNonVersionedProductState(kSystemInstall_,
                                                      kProductType_))
-        ->set_version(base::Version());
+        ->set_version(Version());
   }
 
   static const bool kSystemInstall_;
   static const BrowserDistribution::Type kProductType_;
-  base::Version product_version_;
-  base::Version max_version_;
+  Version product_version_;
+  Version max_version_;
   scoped_ptr<FakeInstallationState> original_state_;
   scoped_ptr<installer::InstallerState> installer_state_;
 };
 
 const bool FindArchiveToPatchTest::kSystemInstall_ = false;
 const BrowserDistribution::Type FindArchiveToPatchTest::kProductType_ =
     BrowserDistribution::CHROME_BROWSER;
 
 }  // namespace
 
@@ skipping 116 matching lines @@
 }
 
 TEST(SetupUtilTest, ContainsUnsupportedSwitch) {
   EXPECT_FALSE(installer::ContainsUnsupportedSwitch(
       CommandLine::FromString(L"foo.exe")));
   EXPECT_FALSE(installer::ContainsUnsupportedSwitch(
       CommandLine::FromString(L"foo.exe --multi-install --chrome")));
   EXPECT_TRUE(installer::ContainsUnsupportedSwitch(
       CommandLine::FromString(L"foo.exe --chrome-frame")));
 }