Use base::win::GetVersion for Windows run-time version checks in preference to

base::SysInfo::OperatingSystemVersionNumbers. The latter is just a
harder-to-use wrapper around the former.

BUG=86062
TEST=none
Review URL: http://codereview.chromium.org/7150018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89055 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 18 deletions

diff --git a/chrome_frame/dll_redirector.cc b/chrome_frame/dll_redirector.cc
index f03c124..dfb837b 100644
--- a/chrome_frame/dll_redirector.cc
+++ b/chrome_frame/dll_redirector.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -15,7 +15,6 @@
 #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"
@@ -57,11 +56,7 @@ DllRedirector* DllRedirector::GetInstance() {
 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;
   }
diff --git a/chrome_frame/test/dll_redirector_test.cc b/chrome_frame/test/dll_redirector_test.cc
index 13959dc..cfa9349 100644
--- a/chrome_frame/test/dll_redirector_test.cc
+++ b/chrome_frame/test/dll_redirector_test.cc
@@ -5,10 +5,10 @@
 #include "chrome_frame/dll_redirector.h"
 
 #include "base/shared_memory.h"
-#include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "base/win/scoped_handle.h"
+#include "base/win/windows_version.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "gtest/gtest.h"
 
@@ -329,11 +329,7 @@ TEST_F(DllRedirectorTest, LowIntegrityAccess) {
       shared_memory.Unlock();
   }
 
-  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) {
     // Now move to low integrity
     chrome_frame_test::LowIntegrityToken low_integrity_token;
     ASSERT_TRUE(low_integrity_token.Impersonate());
@@ -375,11 +371,7 @@ TEST_F(DllRedirectorTest, LowIntegrityAccessDenied) {
       shared_memory.Unlock();
   }
 
-  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) {
     // Now move to low integrity
     chrome_frame_test::LowIntegrityToken low_integrity_token;
     low_integrity_token.Impersonate();