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

sandbox/tests/common/controller.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 "sandbox/tests/common/controller.h"
 
 #include <string>
 
 #include "base/win/windows_version.h"
 #include "sandbox/src/sandbox_factory.h"
@@ skipping 37 matching lines @@
   full_path += L"\\SysWOW64\\";
   full_path += name;
   return full_path;
 }
 
 }  // namespace
 
 namespace sandbox {
 
 std::wstring MakePathToSys(const wchar_t* name, bool is_obj_man_path) {
-  if (base::win::GetWOW64Status() == base::win::WOW64_ENABLED)
-    return MakePathToSysWow64(name, is_obj_man_path);
-  return MakePathToSys32(name, is_obj_man_path);
+  return (base::win::OSInfo::GetInstance()->wow64_status() ==
+      base::win::OSInfo::WOW64_ENABLED) ?

[rvargas (doing something else), 2011/04/06 23:28:05]

nit: The previous structure was easier to read... but I suspect it's caused by
the indentation.

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

Yeah, having to linebreak + indent the conditional really mucks this up :(

+      MakePathToSysWow64(name, is_obj_man_path) :
+      MakePathToSys32(name, is_obj_man_path);
 }
 
 BrokerServices* GetBroker() {
   static BrokerServices* broker = SandboxFactory::GetBrokerServices();
   static bool is_initialized = false;
 
   if (!broker) {
     return NULL;
   }
 
@@ skipping 60 matching lines @@
   if (!is_init_)
     return false;
 
   std::wstring win32_path = MakePathToSys32(pattern, false);
   if (win32_path.empty())
     return false;
 
   if (!AddRule(TargetPolicy::SUBSYS_FILES, semantics, win32_path.c_str()))
     return false;
 
-  if (base::win::GetWOW64Status() != base::win::WOW64_ENABLED)
+  if (base::win::OSInfo::GetInstance()->wow64_status() !=
+      base::win::OSInfo::WOW64_ENABLED)
     return true;
 
   win32_path = MakePathToSysWow64(pattern, false);
   if (win32_path.empty())
     return false;
 
   return AddRule(TargetPolicy::SUBSYS_FILES, semantics, win32_path.c_str());
 }
 
 bool TestRunner::AddFsRule(TargetPolicy::Semantics semantics,
@@ skipping 128 matching lines @@
   if (BEFORE_REVERT == state)
     return command(argc - 4, argv + 4);
   else if (EVERY_STATE == state)
     command(argc - 4, argv + 4);
 
   target->LowerToken();
   return command(argc - 4, argv + 4);
 }
 
 }  // namespace sandbox