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

chrome_frame/chrome_tab.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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Include without path to make GYP build see it.
 #include "chrome_tab.h"  // NOLINT
 
 #include <atlsecurity.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/logging_win.h"
 #include "base/path_service.h"
 #include "base/registry.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.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/installer/util/google_update_settings.h"
 #include "grit/chrome_frame_resources.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/chrome_active_document.h"
 #include "chrome_frame/chrome_frame_activex.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/exception_barrier.h"
 #include "chrome_frame/chrome_frame_reporting.h"
@@ skipping 257 matching lines @@
 // - Heavy system memory usage after reboot will nullify the benefits
 //  but the user will still pay the cost.
 // - Overall the time saved will always be less than total time spent
 //  paging in chrome
 // - We are not sure when the chrome 'warm up' will age out from the
 //  boot prefetch file.
 //
 // The idea here is to try this out on chrome frame dev channel
 // and see if it produces a significant drift in startup numbers.
 HRESULT SetupRunOnce() {
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA)
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA)
     return S_OK;
 
   std::wstring channel_name;
   if (!GoogleUpdateSettings::GetChromeChannel(true, &channel_name) ||
       (0 != lstrcmpiW(L"dev", channel_name.c_str()))) {
     return S_OK;
   }
 
   HKEY hive = HKEY_CURRENT_USER;
   if (IsSystemProcess()) {
@@ skipping 378 matching lines @@
     result = key.DeleteValue(L"ChromeTab.ChromeActiveDocument");
     result = key.DeleteValue(L"ChromeTab.ChromeActiveDocument.1") && result;
   }
 
   return result;
 }
 
 bool RegisterSecuredMimeHandler(bool enable, bool is_system) {
   if (!is_system) {
     return SetOrDeleteMimeHandlerKey(enable, HKEY_CURRENT_USER);
-  } else if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
+  } else if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     return SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE);
   }
 
   std::wstring mime_key = kInternetSettings;
   mime_key.append(L"\\Secure Mime Handlers");
   std::wstring backup_key = kInternetSettings;
   backup_key.append(L"\\__backup_SMH__");
   std::wstring object_name = L"MACHINE\\";
   object_name.append(mime_key);
 
@@ skipping 21 matching lines @@
     sd.GetDacl(&new_dacl);
     new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ);
     if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) {
       result = SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE);
     }
   }
 
   backup.RestoreSecurity(object_name.c_str());
   return result;
 }