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

chrome_frame/chrome_launcher_utils.cc

-// 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.
 
 #include "chrome_frame/chrome_launcher_utils.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #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"
 
 namespace chrome_launcher {
 
 const wchar_t kLauncherExeBaseName[] = L"chrome_launcher.exe";
 
 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());
   }
 
   // The launcher EXE will be in the same directory as the Chrome Frame DLL,
   // so create a full path to it based on this assumption.  Since our unit
   // tests also use this function, and live in the directory above, we test
   // existence of the file and try the path that includes the /servers/
   // directory if needed.
   FilePath module_path;
   if (PathService::Get(base::FILE_MODULE, &module_path)) {
@@ skipping 25 matching lines @@
   // instead.
   if (!file_util::PathExists(cur_path)) {
     PathService::Get(base::DIR_MODULE, &cur_path);
     cur_path = cur_path.DirName().Append(chrome::kBrowserProcessExecutableName);
   }
 
   return cur_path;
 }
 
 }  // namespace chrome_launcher