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

sandbox/src/dep_test.cc

-// Copyright (c) 2006-2008 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 "sandbox/src/dep.h"
 
 #include "sandbox/src/sandbox_utils.h"
 #include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
 
 namespace {
 
-class DepTest : public testing::Test {
- public:
-  static bool IsTestCaseDisabled() {
-    OSVERSIONINFOEX version_info;
-    version_info.dwOSVersionInfoSize = sizeof version_info;
-    GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info));
-
-    // Windows 2000 doesn't support DEP at all.
-    if (version_info.dwMajorVersion == 5 && version_info.dwMinorVersion == 0)
-      return true;
-
-    // Windows XP Service Pack 0 and 1 don't support DEP at all.
-    if (version_info.dwMajorVersion == 5 && version_info.dwMinorVersion == 1
-        && version_info.wServicePackMajor < 2)
-      return true;
-
-    // Bug 1212371 Vista SP0 DEP support is half-baked. Nobody seem to have
-    // noticed!
-    if (version_info.dwMajorVersion == 6 &&
-        version_info.wServicePackMajor == 0)
-      return true;
-
-    return false;
-  }
-};
-
 BYTE kReturnCode[] = {
   // ret
   0xC3,
 };
 
 typedef void (*NullFunction)();
 
 // This doesn't fail on Vista Service Pack 0 but it does on XP SP2 and Vista
 // SP1. I guess this is a bug in Vista SP0 w.r.t .data PE section. Needs
 // investigation to be sure it is a bug and not an error on my part.
@@ skipping 109 matching lines @@
       return SBOX_TEST_SUCCEEDED;
     default:
       return SBOX_TEST_INVALID_PARAMETER;
   }
   return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 }
 
 }  // namespace
 
 // This test is disabled. See bug 1275842
-TEST_F(DepTest, DISABLED_TestDepDisable) {
+TEST(DepTest, DISABLED_TestDepDisable) {
   TestRunner runner(JOB_UNPROTECTED, USER_INTERACTIVE, USER_INTERACTIVE);
 
   runner.SetTimeout(INFINITE);
 
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"CheckDepLevel 1"));
   // TODO(maruel):  bug 1207762 Somehow test ATL7
   // EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"CheckDepLevel 2"));
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"CheckDepLevel 3"));
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"CheckDepLevel 4"));
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"CheckDepLevel 5"));
   EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"CheckDepLevel 6"));
 }
 
 }  // namespace sandbox