Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2669)

Unified Diff: chrome_frame/test/dll_redirector_test.cc

Issue 7150018: Use GetVersion for Windows run-time version checks in preference to OperatingSystemVersionNumbers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/dll_redirector.cc ('k') | net/socket/tcp_client_socket_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/dll_redirector_test.cc
===================================================================
--- chrome_frame/test/dll_redirector_test.cc (revision 89028)
+++ chrome_frame/test/dll_redirector_test.cc (working copy)
@@ -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 @@
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 @@
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();
« no previous file with comments | « chrome_frame/dll_redirector.cc ('k') | net/socket/tcp_client_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698