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

chrome/installer/util/google_update_settings_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 <windows.h>
 #include <shlwapi.h>  // For SHDeleteKey.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
@@ skipping 437 matching lines @@
 
 TEST_F(GoogleUpdateSettingsTest, SetEULAConsent) {
   using installer::FakeInstallationState;
 
   const bool multi_install = true;
   const bool system_level = true;
   FakeInstallationState machine_state;
 
   // Chrome is installed.
   machine_state.AddChrome(system_level, multi_install,
-      new base::Version(chrome::kChromeVersion));
+      new Version(chrome::kChromeVersion));
 
   RegKey key;
   DWORD value;
   BrowserDistribution* binaries =
       BrowserDistribution::GetSpecificDistribution(
           BrowserDistribution::CHROME_BINARIES);
   BrowserDistribution* chrome =
       BrowserDistribution::GetSpecificDistribution(
           BrowserDistribution::CHROME_BROWSER);
 
@@ skipping 273 matching lines @@
       .WriteValue(google_update::kRegGoogleUpdateVersion, L"");
   EXPECT_FALSE(
       GoogleUpdateSettings::GetGoogleUpdateVersion(system_install_).IsValid());
 }
 
 // Tests that GetGoogleUpdateVersion returns the correct string if there's a
 // version value in the Software\Google\Update key.
 TEST_P(GetGoogleUpdateVersion, TestRealValue) {
   RegKey(root_key_, google_update::kRegPathGoogleUpdate, KEY_SET_VALUE)
       .WriteValue(google_update::kRegGoogleUpdateVersion, kDummyVersion);
-  base::Version expected(base::UTF16ToUTF8(kDummyVersion));
+  Version expected(base::UTF16ToUTF8(kDummyVersion));
   EXPECT_TRUE(expected.Equals(
       GoogleUpdateSettings::GetGoogleUpdateVersion(system_install_)));
   // Make sure that there's no value in the other level (user or system).
   EXPECT_FALSE(
       GoogleUpdateSettings::GetGoogleUpdateVersion(!system_install_)
           .IsValid());
 }
 
 INSTANTIATE_TEST_CASE_P(GetGoogleUpdateVersionAtLevel, GetGoogleUpdateVersion,
                         testing::Bool());
@@ skipping 253 matching lines @@
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::FALSE_SETTING, StatsState::FALSE_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::FALSE_SETTING, StatsState::TRUE_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::TRUE_SETTING, StatsState::NO_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::TRUE_SETTING, StatsState::FALSE_SETTING),
         StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
                    StatsState::TRUE_SETTING, StatsState::TRUE_SETTING)));