Make the windows_version.h functions threadsafe by using a singleton.

chrome/test/out_of_proc_test_runner.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 <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
@@ skipping 561 matching lines @@
         sandbox::TargetPolicy* policy = broker_services->CreatePolicy();
         sandbox::ResultCode result = policy->CreateAlternateDesktop(true);
         CHECK(sandbox::SBOX_ERROR_FAILED_TO_SWITCH_BACK_WINSTATION != result);
         policy->Release();
       }
     }
 #endif
     return ChromeTestSuite(argc, argv).Run();
   }
 
+  // The exit manager is in charge of calling the dtors of singleton objects.
+  // We need one here because the global variable inside the AtExitManager is a
+  // different memory location in this .exe versus in chrome.dll, so
+  // initializing one in ChromeMain() below won't help when it calls back out to
+  // Singleton-using functions in this .exe.  We can't declare this at the top
+  // of main() because ChromeTestSuite, declared above, also instantiates one.
+  base::AtExitManager exit_manager;

[cpu_(ooo_6.6-7.5), 2011/04/06 21:11:42]

seem correct to me. Different modules need different atexit managers, at least
on windows.

[Peter Kasting, 2011/04/07 00:29:19]

This comment led me to clarify the comment block here even more.

+
 #if defined(OS_WIN)
   if (command_line->HasSwitch(switches::kProcessType)) {
     // This is a child process, call ChromeMain.
     FilePath chrome_path(command_line->GetProgram().DirName());
     chrome_path = chrome_path.Append(chrome::kBrowserResourcesDll);
     HMODULE dll = LoadLibrary(chrome_path.value().c_str());
     DLL_MAIN entry_point =
         reinterpret_cast<DLL_MAIN>(::GetProcAddress(dll, "ChromeMain"));
     if (!entry_point)
       return -1;
@@ skipping 36 matching lines @@
       exit_code = 1;
       break;
     }
 
     // Special value "-1" means "repeat indefinitely".
     if (cycles != -1)
       cycles--;
   }
   return exit_code;
 }