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

chrome_frame/test/test_with_web_server.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_frame/test/test_with_web_server.h"
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/files/memory_mapped_file.h"
@@ skipping 288 matching lines @@
       FileVersionInfo::CreateFileVersionInfo(plugin_path);
 
   std::wstring version;
   if (version_info)
     version = version_info->product_version();
 
   // If we can't find the Chrome Frame DLL in the src tree, we turn to
   // the directory where chrome is installed.
   if (!version_info) {
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-    base::Version ver_system;
+    Version ver_system;
     InstallUtil::GetChromeVersion(dist, true, &ver_system);
-    base::Version ver_user;
+    Version ver_user;
     InstallUtil::GetChromeVersion(dist, false, &ver_system);
     ASSERT_TRUE(ver_system.IsValid() || ver_user.IsValid());
 
     bool system_install = ver_system.IsValid();
     base::FilePath cf_dll_path(installer::GetChromeInstallPath(system_install, dist));
     cf_dll_path = cf_dll_path.Append(base::UTF8ToWide(
         ver_system.IsValid() ? ver_system.GetString() : ver_user.GetString()));
     cf_dll_path = cf_dll_path.Append(kChromeFrameDllName);
     version_info = FileVersionInfo::CreateFileVersionInfo(cf_dll_path);
     if (version_info)
@@ skipping 770 matching lines @@
 // This test loads a large page and ensures that the full page contents are
 // actually loaded via a self-validating HTML page. This is done due to a bug
 // whereby the middle of the response stream would sometimes be truncated when
 // loading a CF document. See http://crbug.com/178421 for details.
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_LargePageLoad) {
   const wchar_t kLargePageLoadPage[] =
       L"chrome_frame_large_page.html";
 
   SimpleBrowserTest(IE, kLargePageLoadPage);
 }