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

chrome/installer/util/install_util.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.
 //
 // See the corresponding header file for description of the functions in this
 // file.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item_list.h"
 
 bool InstallUtil::ExecuteExeAsAdmin(const std::wstring& exe,
                                     const std::wstring& params,
@@ skipping 39 matching lines @@
     key.Close();
     return NULL;
   }
   key.Close();
   LOG(INFO) << "Existing Chrome version found " << version_str;
   return installer::Version::GetVersionFromString(version_str);
 }
 
 bool InstallUtil::IsOSSupported() {
   int major, minor;
-  win_util::WinVersion version = win_util::GetWinVersion();
-  win_util::GetServicePackLevel(&major, &minor);
+  base::win::Version version = base::win::GetVersion();
+  base::win::GetServicePackLevel(&major, &minor);
 
   // We do not support Win2K or older, or XP without service pack 2.
   LOG(INFO) << "Windows Version: " << version
             << ", Service Pack: " << major << "." << minor;
-  if ((version > win_util::WINVERSION_XP) ||
-      (version == win_util::WINVERSION_XP && major >= 2)) {
+  if ((version > base::win::VERSION_XP) ||
+      (version == base::win::VERSION_XP && major >= 2)) {
     return true;
   }
   return false;
 }
 
 void InstallUtil::WriteInstallerResult(bool system_install,
                                        installer_util::InstallStatus status,
                                        int string_resource_id,
                                        const std::wstring* const launch_cmd) {
   HKEY root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
@@ skipping 174 matching lines @@
                                       const std::wstring& value_name) {
   RegKey key(reg_root, key_path.c_str(), KEY_ALL_ACCESS);
   LOG(INFO) << "Deleting registry value " << value_name;
   if (key.ValueExists(value_name.c_str()) &&
       !key.DeleteValue(value_name.c_str())) {
     LOG(ERROR) << "Failed to delete registry value: " << value_name;
     return false;
   }
   return true;
 }