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

chrome_frame/delete_chrome_history.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.
 
 // Implementation of DeleteChromeHistory
 #include "chrome_frame/delete_chrome_history.h"
 
 #include "chrome/browser/browsing_data_remover.h"
 
+#include "base/win/windows_version.h"
 #include "chrome_frame/chrome_frame_activex.h"
 #include "chrome_frame/utils.h"
 
 // Below other header to avoid symbol pollution.
 #define INITGUID
 #include <deletebrowsinghistory.h>
 
 DeleteChromeHistory::DeleteChromeHistory()
   : remove_mask_(0) {
   DLOG(INFO) << __FUNCTION__;
@@ skipping 38 matching lines @@
   // in lieu of sending an IPC when it seems appropriate. Since we assume this
   // happens in one-off fashion, don't attempt to pack REMOVE_* arguments.
   // Instead, have the browser process clobber all history.
   //
   // IE8 on Vista launches us twice when the user asks to delete browsing data -
   // once in low integrity and once in medium integrity. The low integrity
   // instance will fail to connect to the automation server and restart it in an
   // effort to connect. Thus, we detect if we are in that circumstance and exit
   // silently.
   base::IntegrityLevel integrity_level;
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA &&
       !base::GetProcessIntegrityLevel(base::GetCurrentProcessHandle(),
                                       &integrity_level)) {
     return E_UNEXPECTED;
   }
   if (integrity_level == base::LOW_INTEGRITY) {
     return S_OK;
   }
   if (!InitializeAutomation(GetHostProcessName(false), L"", false, false,
                             GURL(), GURL(), true)) {
     return E_UNEXPECTED;
@@ skipping 11 matching lines @@
     remove_mask_ |= BrowsingDataRemover::REMOVE_HISTORY;
 
   loop_.PostDelayedTask(FROM_HERE,
       new MessageLoop::QuitTask, 1000 * 600);
   loop_.MessageLoop::Run();
 
   return S_OK;
 }