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

chrome/test/mini_installer_test/test.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.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/util_constants.h"
 #include "chrome/test/mini_installer_test/chrome_mini_installer.h"
 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
 #include "chrome/test/mini_installer_test/mini_installer_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 // Although the C++ style guide disallows use of namespace directive, use
@@ skipping 24 matching lines @@
 
   virtual void SetUp() {
     // Parse test command-line arguments.
     const CommandLine* cmd = CommandLine::ForCurrentProcess();
     std::wstring build =
         cmd->GetSwitchValueNative(switches::kInstallerTestBuild);
     if (build.empty())
       build = L"latest";
     force_tests_ = cmd->HasSwitch(switches::kInstallerTestForce);
     chrome_frame_ = cmd->HasSwitch(installer_util::switches::kChromeFrame);
-    if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA ||
+    if (base::win::GetVersion() < base::win::VERSION_VISTA ||
         force_tests_) {
       CleanTheSystem();
       // Separate the test output from cleaning output
       printf("\nBEGIN test----------------------------------------\n");
 
       // Create a few differently configured installers that are used in
       // the tests, for convenience.
       user_inst_.reset(new ChromeMiniInstaller(kUserInstall,
                                                chrome_frame_));
       sys_inst_.reset(new ChromeMiniInstaller(kSystemInstall,
@@ skipping 118 matching lines @@
 #endif
 TEST_F(MiniInstallTest, MAYBE_InstallMiniInstallerUser) {
   user_inst_->Install();
 }
 
 TEST_F(MiniInstallTest, MiniInstallTestValidWindowsVersion) {
   // We run the tests on all supported OSes.
   // Make sure the code agrees.
   EXPECT_TRUE(InstallUtil::IsOSSupported());
 }