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

chrome/browser/geolocation/wifi_data_provider_win.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.
 
 // Windows Vista uses the Native Wifi (WLAN) API for accessing WiFi cards. See
 // http://msdn.microsoft.com/en-us/library/ms705945(VS.85).aspx. Windows XP
 // Service Pack 3 (and Windows XP Service Pack 2, if upgraded with a hot fix)
 // also support a limited version of the WLAN API. See
 // http://msdn.microsoft.com/en-us/library/bb204766.aspx. The WLAN API uses
 // wlanapi.h, which is not part of the SDK used by Gears, so is replicated
 // locally using data from the MSDN.
 //
 // Windows XP from Service Pack 2 onwards supports the Wireless Zero
 // Configuration (WZC) programming interface. See
 // http://msdn.microsoft.com/en-us/library/ms706587(VS.85).aspx.
 //
 // The MSDN recommends that one use the WLAN API where available, and WZC
 // otherwise.
 //
 // However, it seems that WZC fails for some wireless cards. Also, WLAN seems
 // not to work on XP SP3. So we use WLAN on Vista, and use NDIS directly
 // otherwise.
 
 #include "chrome/browser/geolocation/wifi_data_provider_win.h"
 
 #include <windows.h>
 #include <winioctl.h>
 #include <wlanapi.h>
+
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/geolocation/wifi_data_provider_common.h"
 #include "chrome/browser/geolocation/wifi_data_provider_common_win.h"
 
 // Taken from ndis.h for WinCE.
 #define NDIS_STATUS_INVALID_LENGTH   ((NDIS_STATUS)0xC0010014L)
 #define NDIS_STATUS_BUFFER_TOO_SHORT ((NDIS_STATUS)0xC0010016L)
 
 namespace {
 // The limits on the size of the buffer used for the OID query.
 const int kInitialBufferSize = 2 << 12;  // Good for about 50 APs.
@@ skipping 146 matching lines @@
 WindowsWlanApi::WindowsWlanApi(HINSTANCE library)
     : library_(library) {
   GetWLANFunctions(library_);
 }
 
 WindowsWlanApi::~WindowsWlanApi() {
   FreeLibrary(library_);
 }
 
 WindowsWlanApi* WindowsWlanApi::Create() {
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA)
+  if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return NULL;
   // We use an absolute path to load the DLL to avoid DLL preloading attacks.
   string16 system_directory;
   if (!GetSystemDirectory(&system_directory)) {
     return NULL;
   }
   DCHECK(!system_directory.empty());
   string16 dll_path = system_directory + L"wlanapi.dll";
   HINSTANCE library = LoadLibraryEx(dll_path.c_str(),
                                     NULL,
@@ skipping 389 matching lines @@
 
   path->assign(buffer.get(), characters_written);
 
   if (*path->rbegin() != L'\\') {
     path->append(L"\\");
   }
   DCHECK_EQ(L'\\', *path->rbegin());
   return true;
 }
 }  // namespace