Use GetVersion for Windows run-time version checks in preference to OperatingSystemVersionNumbers

chrome_frame/dll_redirector.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/dll_redirector.h"
 
 #include <aclapi.h>
 #include <atlbase.h>
 #include <atlsecurity.h>
 #include <sddl.h>
 
 #include "base/file_path.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
-#include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "base/win/windows_version.h"
 #include "chrome_frame/utils.h"
 
 const wchar_t kSharedMemoryName[] = L"ChromeFrameVersionBeacon_";
 const uint32 kSharedMemorySize = 128;
 const uint32 kSharedMemoryLockTimeoutMs = 1000;
 
 // static
@@ skipping 21 matching lines @@
 }
 
 // static
 DllRedirector* DllRedirector::GetInstance() {
   return Singleton<DllRedirector>::get();
 }
 
 bool DllRedirector::BuildSecurityAttributesForLock(
     CSecurityAttributes* sec_attr) {
   DCHECK(sec_attr);
-  int32 major_version, minor_version, fix_version;
-  base::SysInfo::OperatingSystemVersionNumbers(&major_version,
-                                               &minor_version,
-                                               &fix_version);
-  if (major_version < 6) {
+  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     // Don't bother with changing ACLs on pre-vista.
     return false;
   }
 
   bool success = false;
 
   // Fill out the rest of the security descriptor from the process token.
   CAccessToken token;
   if (token.GetProcessToken(TOKEN_QUERY)) {
     CSecurityDesc security_desc;
@@ skipping 216 matching lines @@
                            .Append(module_name);
 
   HMODULE hmodule = LoadLibrary(module_path.value().c_str());
   if (hmodule == NULL) {
     DPLOG(ERROR) << "Could not load reported module version "
                  << version->GetString();
   }
 
   return hmodule;
 }