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

chrome/browser/views/about_chrome_view.cc

Index: chrome/browser/views/about_chrome_view.cc
===================================================================
--- chrome/browser/views/about_chrome_view.cc	(revision 62510)
+++ chrome/browser/views/about_chrome_view.cc	(working copy)
@@ -14,6 +14,7 @@
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -524,12 +525,12 @@
       // work as before - enabling UAC or installing the latest service pack
       // for Vista is another option.
       int service_pack_major = 0, service_pack_minor = 0;
-      win_util::GetServicePackLevel(&service_pack_major, &service_pack_minor);
+      base::win::GetServicePackLevel(&service_pack_major, &service_pack_minor);
       if (win_util::UserAccountControlIsEnabled() ||
-          win_util::GetWinVersion() == win_util::WINVERSION_XP ||
-          (win_util::GetWinVersion() == win_util::WINVERSION_VISTA &&
+          base::win::GetVersion() == base::win::VERSION_XP ||
+          (base::win::GetVersion() == base::win::VERSION_VISTA &&
            service_pack_major >= 1) ||
-          win_util::GetWinVersion() > win_util::WINVERSION_VISTA) {
+          base::win::GetVersion() > base::win::VERSION_VISTA) {
         UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR);
         // CheckForUpdate(false, ...) means don't upgrade yet.
         google_updater_->CheckForUpdate(false, window());