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

chrome_frame/test/dll_redirector_test.cc

 // 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 "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"
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 const char kMockVersionString[] = "42.42.42.42";
 const char kMockVersionString2[] = "133.33.33.7";
 
 const HMODULE kMockModuleHandle = reinterpret_cast<HMODULE>(42);
 const HMODULE kMockModuleHandle2 = reinterpret_cast<HMODULE>(43);
@@ skipping 300 matching lines @@
     // Ensure that the shared memory is read-only:
     EXPECT_FALSE(shared_memory.Open(kTestVersionBeaconName, false));
     shared_memory.Close();
     EXPECT_TRUE(shared_memory.Open(kTestVersionBeaconName, true));
     shared_memory.Close();
 
     if (mutex_locked)
       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());
 
     // Ensure that we can also acquire the mutex from low integrity.
     base::SharedMemory shared_memory(ASCIIToWide(kTestVersionBeaconName));
     bool mutex_locked = shared_memory.Lock(kWaitTestTimeout, NULL);
     EXPECT_TRUE(mutex_locked);
 
     // Ensure that the shared memory is read-only:
@@ skipping 21 matching lines @@
     EXPECT_TRUE(mutex_locked);
 
     // We should be able to open the memory as read/write.
     EXPECT_TRUE(shared_memory.Open(kTestVersionBeaconName, false));
     shared_memory.Close();
 
     if (mutex_locked)
       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();
 
     // Ensure that we can't acquire the mutex without having set the
     // Low Integrity ACE in the SACL.
     base::SharedMemory shared_memory(ASCIIToWide(kTestVersionBeaconName));
     bool mutex_locked = shared_memory.Lock(kWaitTestTimeout, NULL);
     EXPECT_FALSE(mutex_locked);
 
     // We shouldn't be able to open the memory.
     EXPECT_FALSE(shared_memory.Open(kTestVersionBeaconName, false));
     shared_memory.Close();
 
     if (mutex_locked)
       shared_memory.Unlock();
   }
 }