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

base/win_util_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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 <windows.h>
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The test is somewhat silly, because the Vista bots some have UAC enabled
 // and some have it disabled. At least we check that it does not crash.
 TEST(BaseWinUtilTest, TestIsUACEnabled) {
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     win_util::UserAccountControlIsEnabled();
   } else {
     EXPECT_TRUE(win_util::UserAccountControlIsEnabled());
   }
 }
 
 TEST(BaseWinUtilTest, TestGetUserSidString) {
   std::wstring user_sid;
   EXPECT_TRUE(win_util::GetUserSidString(&user_sid));
   EXPECT_TRUE(!user_sid.empty());
@@ skipping 53 matching lines @@
   ASSERT_TRUE(string_buffer);
 
   // Verify the string is the same by different calls
   EXPECT_EQ(win_util::FormatLastWin32Error(), std::wstring(string_buffer));
   EXPECT_EQ(win_util::FormatMessage(kAccessDeniedErrorCode),
             std::wstring(string_buffer));
 
   // Done with the buffer allocated by ::FormatMessage()
   LocalFree(string_buffer);
 }