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

app/resource_bundle_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.
 
 #include "app/resource_bundle.h"
 
 #include <atlbase.h>
 
 #include "app/app_paths.h"
 #include "app/l10n_util.h"
 #include "base/data_pack.h"
 #include "base/debug_util.h"
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/resource_util.h"
 #include "base/stl_util-inl.h"
 #include "base/string_piece.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
+
 #include "gfx/font.h"
 
 namespace {
 
 // Returns the flags that should be passed to LoadLibraryEx.
 DWORD GetDataDllLoadFlags() {
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA)
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA)
     return LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_AS_IMAGE_RESOURCE;
 
   return DONT_RESOLVE_DLL_REFERENCES;
 }
 
 }  // end anonymous namespace
 
 ResourceBundle::~ResourceBundle() {
   FreeImages();
   UnloadLocaleResources();
@@ skipping 118 matching lines @@
                                       message_id);
     if (!image) {
       StackTrace().PrintBacktrace();  // See http://crbug.com/21925.
       NOTREACHED() << "unable to find resource: " << message_id;
       return std::wstring();
     }
   }
   // Copy into a string16 and return.
   return string16(image->achString, image->nLength);
 }