Make the windows_version.h functions threadsafe by using a singleton. Add accessors to the singl...

sandbox/src/integrity_level_test.cc

Index: sandbox/src/integrity_level_test.cc
===================================================================
--- sandbox/src/integrity_level_test.cc	(revision 80824)
+++ sandbox/src/integrity_level_test.cc	(working copy)
@@ -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.
 
@@ -45,7 +45,7 @@
 }
 
 TEST(IntegrityLevelTest, TestLowILReal) {
-  if (base::win::VERSION_VISTA != base::win::GetVersion())
+  if (base::win::GetVersion() != base::win::VERSION_VISTA)
     return;
 
   TestRunner runner(JOB_LOCKDOWN, USER_INTERACTIVE, USER_INTERACTIVE);
@@ -61,7 +61,7 @@
 }
 
 TEST(DelayedIntegrityLevelTest, TestLowILDelayed) {
-  if (base::win::VERSION_VISTA != base::win::GetVersion())
+  if (base::win::GetVersion() != base::win::VERSION_VISTA)
     return;
 
   TestRunner runner(JOB_LOCKDOWN, USER_INTERACTIVE, USER_INTERACTIVE);
@@ -77,7 +77,7 @@
 }
 
 TEST(IntegrityLevelTest, TestNoILChange) {
-  if (base::win::VERSION_VISTA != base::win::GetVersion())
+  if (base::win::GetVersion() != base::win::VERSION_VISTA)
     return;
 
   TestRunner runner(JOB_LOCKDOWN, USER_INTERACTIVE, USER_INTERACTIVE);