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

sandbox/tests/integration_tests/integration_tests.cc

Index: sandbox/tests/integration_tests/integration_tests.cc
===================================================================
--- sandbox/tests/integration_tests/integration_tests.cc	(revision 80824)
+++ sandbox/tests/integration_tests/integration_tests.cc	(working copy)
@@ -1,11 +1,15 @@
-// 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 "base/at_exit.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "sandbox/tests/common/controller.h"
 
 int wmain(int argc, wchar_t **argv) {
+  // The exit manager is in charge of calling the dtors of singleton objects.
+  base::AtExitManager exit_manager;
+
   if (argc >= 2) {
     if (0 == _wcsicmp(argv[1], L"-child"))
       // This instance is a child, not the test.