Fix all places where we used the GetWinVersion function...

chrome/installer/setup/main.cc

 // Copyright (c) 2006-2008 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 <string>
 #include <windows.h>
 #include <msi.h>
 #include <shlobj.h>
 
 #include "base/at_exit.h"
@@ skipping 506 matching lines @@
         installer_util::switches::kRegisterChromeBrowser));
     return ShellUtil::AddChromeToSetAccessDefaults(chrome_exe, true);
   // If --rename-chrome-exe is specified, we want to rename the executables
   // and exit.
   } else if (parsed_command_line.HasSwitch(
       installer_util::switches::kRenameChromeExe)) {
     return RenameChromeExecutables(system_install);
   }
 
   if (system_install && !IsUserAnAdmin()) {
-    if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA &&
+    if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
         !parsed_command_line.HasSwitch(installer_util::switches::kRunAsAdmin)) {
       std::wstring exe = parsed_command_line.program();
       std::wstring params(command_line);
       // Append --run-as-admin flag to let the new instance of setup.exe know
       // that we already tried to launch ourselves as admin.
       params.append(L" --");
       params.append(installer_util::switches::kRunAsAdmin);
       DWORD exit_code = installer_util::UNKNOWN_STATUS;
       InstallUtil::ExecuteExeAsAdmin(exe, params, &exit_code);
       return exit_code;
@@ skipping 39 matching lines @@
 
     install_status = InstallChrome(parsed_command_line,
                                    installed_version.get(),
                                    options);
   }
 
   CoUninitialize();
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   return dist->GetInstallReturnCode(install_status);
 }