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

chrome_frame/chrome_launcher_utils.cc

Index: chrome_frame/chrome_launcher_utils.cc
===================================================================
--- chrome_frame/chrome_launcher_utils.cc	(revision 62510)
+++ chrome_frame/chrome_launcher_utils.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,7 +9,7 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/chrome_frame_automation.h"
@@ -20,7 +20,7 @@
 
 CommandLine* CreateLaunchCommandLine() {
   // Shortcut for OS versions that don't need the integrity broker.
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     return new CommandLine(GetChromeExecutablePath());
   }