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

chrome/test/ui/ui_test.cc

Index: chrome/test/ui/ui_test.cc
===================================================================
--- chrome/test/ui/ui_test.cc	(revision 62510)
+++ chrome/test/ui/ui_test.cc	(working copy)
@@ -50,7 +50,7 @@
 #include "net/base/net_util.h"
 
 #if defined(OS_WIN)
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #endif
 
 
@@ -940,7 +940,7 @@
   // it will mess up with the command window and cause conhost.exe to crash. To
   // work around this, we start the http server on the background mode.
 #if defined(OS_WIN)
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7)
+  if (base::win::GetVersion() >= base::win::VERSION_WIN7)
     cmd_line->AppendSwitch("run_background");
 #endif