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

chrome_frame/test/chrome_frame_test_utils.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 "chrome_frame/test/chrome_frame_test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <iepmapi.h>
 #include <sddl.h>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/registry.h"   // to find IE and firefox
 #include "base/scoped_handle.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome_frame/utils.h"
 
 namespace chrome_frame_test {
 
 const wchar_t kCrashServicePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices";
 
 const DWORD kCrashServicePipeDesiredAccess = FILE_READ_DATA |
@@ skipping 183 matching lines @@
   FreeLibrary(h);
   if (SUCCEEDED(hr)) {
     CloseHandle(pi.hThread);
   } else {
     LOG(ERROR) << base::StringPrintf("IELaunchURL failed: 0x%08X", hr);
   }
   return pi.hProcess;
 }
 
 base::ProcessHandle LaunchIE(const std::wstring& url) {
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     return LaunchIEOnVista(url);
-  } else {
-    return LaunchExecutable(kIEImageName, url);
-  }
+  return LaunchExecutable(kIEImageName, url);
 }
 
 int CloseAllIEWindows() {
   int ret = 0;
 
   ScopedComPtr<IShellWindows> windows;
   HRESULT hr = ::CoCreateInstance(__uuidof(ShellWindows), NULL, CLSCTX_ALL,
       IID_IShellWindows, reinterpret_cast<void**>(windows.Receive()));
   DCHECK(SUCCEEDED(hr));
 
@@ skipping 123 matching lines @@
   AllowSetForegroundWindow(ASFW_ANY);
 
   HRESULT hr = S_OK;
   DWORD cocreate_flags = CLSCTX_LOCAL_SERVER;
   chrome_frame_test::LowIntegrityToken token;
   // Vista has a bug which manifests itself when a medium integrity process
   // launches a COM server like IE which runs in protected mode due to UAC.
   // This causes the IWebBrowser2 interface which is returned to be useless,
   // i.e it does not receive any events, etc. Our workaround for this is
   // to impersonate a low integrity token and then launch IE.
-  if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA &&
+  if (base::win::GetVersion() == base::win::VERSION_VISTA &&
       GetInstalledIEVersion() == IE_7) {
     // Create medium integrity browser that will launch IE broker.
     ScopedComPtr<IWebBrowser2> medium_integrity_browser;
     hr = medium_integrity_browser.CreateInstance(CLSID_InternetExplorer, NULL,
                                                  CLSCTX_LOCAL_SERVER);
     if (FAILED(hr))
       return hr;
     medium_integrity_browser->Quit();
     // Broker remains alive.
     if (!token.Impersonate()) {
@@ skipping 203 matching lines @@
     // First check to see if it's even still running just to minimize the
     // likelihood of spurious error messages from KillProcess.
     if (WAIT_OBJECT_0 != ::WaitForSingleObject(crash_service, 0)) {
       base::KillProcess(crash_service, 0, false);
     }
     return NULL;
   }
 }
 
 }  // namespace chrome_frame_test