Move windows version-related stuff out of base/win_util and into base/win/win...

chrome_frame/test/test_with_web_server.cc

 // Copyright (c) 2010 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_version_info.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome_frame/html_utils.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
 #include "net/base/mime_util.h"
 #include "net/http/http_util.h"
 
@@ skipping 838 matching lines @@
     L"xmlhttprequest_test.html";
 
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_XHRTest) {
   SimpleBrowserTest(IE, kXMLHttpRequestTestUrl);
 }
 
 const wchar_t kInstallFlowTestUrl[] =
     L"install_flow_test.html";
 
 TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_InstallFlowTest) {
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     ScopedChromeFrameRegistrar::UnregisterAtPath(
         ScopedChromeFrameRegistrar::GetChromeFrameBuildPath().value());
 
     ASSERT_TRUE(LaunchBrowser(IE, kInstallFlowTestUrl));
 
     loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
 
     ScopedChromeFrameRegistrar::RegisterAtPath(
         ScopedChromeFrameRegistrar::GetChromeFrameBuildPath().value());
 
@@ skipping 227 matching lines @@
     const test_server::Request& r = c->request();
     if (ASCIIToWide(r.path().substr(1)).compare(kPages[0]) == 0) {
       requests_for_first_page++;
       std::string ua(GetHeaderValue(r.headers(), "User-Agent"));
       EXPECT_NE(std::string::npos, ua.find("chromeframe"));
     }
   }
   EXPECT_GT(requests_for_first_page, 1);
 }