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

base/pe_image_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.
 
 // This file contains unit tests for PEImage.
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "base/pe_image.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 
 // Just counts the number of invocations.
 bool ExportsCallback(const PEImage &image,
                      DWORD ordinal,
                      DWORD hint,
                      LPCSTR name,
                      PVOID function,
                      LPCSTR forward,
                      PVOID cookie) {
   int* count = reinterpret_cast<int*>(cookie);
@@ skipping 120 matching lines @@
   else
     return 0;
 
   return expected[value][os];
 }
 
 // Tests that we are able to enumerate stuff from a PE file, and that
 // the actual number of items found is within the expected range.
 TEST(PEImageTest, EnumeratesPE) {
   // Windows Server 2003 is not supported as a test environment for this test.
-  if (win_util::GetWinVersion() == win_util::WINVERSION_SERVER_2003)
+  if (base::win::GetVersion() == base::win::VERSION_SERVER_2003)
     return;
   HMODULE module = LoadLibrary(L"advapi32.dll");
   ASSERT_TRUE(NULL != module);
 
   PEImage pe(module);
   int count = 0;
   EXPECT_TRUE(pe.VerifyMagic());
 
   DWORD os = pe.GetNTHeaders()->OptionalHeader.MajorOperatingSystemVersion;
   os = os * 10 + pe.GetNTHeaders()->OptionalHeader.MinorOperatingSystemVersion;
@@ skipping 43 matching lines @@
   EXPECT_TRUE(pe.GetProcOrdinal("RegEnumKeyExW", &ordinal));
 
   FARPROC address1 = pe.GetProcAddress("RegEnumKeyExW");
   FARPROC address2 = pe.GetProcAddress(reinterpret_cast<char*>(ordinal));
   EXPECT_TRUE(address1 != NULL);
   EXPECT_TRUE(address2 != NULL);
   EXPECT_TRUE(address1 == address2);
 
   FreeLibrary(module);
 }