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

chrome_frame/simple_resource_loader.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/simple_resource_loader.h"
 
 #include <atlbase.h>
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 
 const wchar_t kLocalesDirName[] = L"Locales";
 
 HINSTANCE SimpleResourceLoader::locale_dll_handle_;
 
 SimpleResourceLoader::SimpleResourceLoader() {
   // Find and load the resource DLL.
   std::wstring language;
   std::wstring region;
   GetSystemLocale(&language, &region);
@@ skipping 79 matching lines @@
     }
   } else {
     NOTREACHED() << "Could not locate locales DLL directory.";
   }
 
   return found_dll;
 }
 
 HINSTANCE SimpleResourceLoader::LoadLocaleDll(const FilePath& dll_path) {
   DWORD load_flags = 0;
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     load_flags = LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE |
                  LOAD_LIBRARY_AS_IMAGE_RESOURCE;
   } else {
     load_flags = DONT_RESOLVE_DLL_REFERENCES;
   }
 
   // The dll should only have resources, not executable code.
   HINSTANCE locale_dll_handle = LoadLibraryEx(dll_path.value().c_str(), NULL,
                                               load_flags);
   DCHECK(locale_dll_handle != NULL) << "unable to load generated resources: "
@@ skipping 27 matching lines @@
 
 // static
 std::wstring SimpleResourceLoader::Get(int message_id) {
   SimpleResourceLoader* loader = SimpleResourceLoader::instance();
   return loader->GetLocalizedResource(message_id);
 }
 
 HINSTANCE SimpleResourceLoader::GetResourceModuleHandle() {
   return locale_dll_handle_;
 }