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

sandbox/src/Wow64.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/src/wow64.h"
 
 #include <sstream>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 70 matching lines @@
 }
 
 // The basic idea is to allocate one page of memory on the child, and initialize
 // the first part of it with our version of PatchInfo32. Then launch the helper
 // process passing it that address on the child. The helper process will patch
 // the 64 bit version of NtMapViewOfFile, and the interception will signal the
 // first event on the buffer. We'll be waiting on that event and after the 32
 // bit version of ntdll is loaded, we'll remove the interception and return to
 // our caller.
 bool Wow64::WaitForNtdll() {
-  if (base::win::GetWOW64Status() != base::win::WOW64_ENABLED)
+  if (base::win::OSInfo::GetInstance()->wow64_status() !=
+      base::win::OSInfo::WOW64_ENABLED)
     return true;
 
   const size_t page_size = 4096;
 
   // Create some default manual reset un-named events, not signaled.
   dll_load_ = ::CreateEvent(NULL, TRUE, FALSE, NULL);
   continue_load_ = ::CreateEvent(NULL, TRUE, FALSE, NULL);
   HANDLE current_process = ::GetCurrentProcess();
   HANDLE remote_load, remote_continue;
   DWORD access = EVENT_MODIFY_STATE | SYNCHRONIZE;
@@ skipping 108 matching lines @@
   SIZE_T read;
   if (!::ReadProcessMemory(child_->Process(), ntdll_, &buffer, kBufferSize,
                            &read))
     return false;
   if (kBufferSize != read)
     return false;
   return true;
 }
 
 }  // namespace sandbox