PPAPI: Fix GetBrowserInterface race conditions

content/ppapi_plugin/ppapi_thread.cc

 // Copyright (c) 2012 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 "content/ppapi_plugin/ppapi_thread.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/cpu.h"
@@ skipping 89 matching lines @@
 typedef int32_t (*InitializeBrokerFunc)
     (PP_ConnectInstance_Func* connect_instance_func);
 
 PpapiThread::PpapiThread(const CommandLine& command_line, bool is_broker)
     : is_broker_(is_broker),
       connect_instance_func_(NULL),
       local_pp_module_(
           base::RandInt(0, std::numeric_limits<PP_Module>::max())),
       next_plugin_dispatcher_id_(1) {
   ppapi::proxy::PluginGlobals* globals = ppapi::proxy::PluginGlobals::Get();
-  globals->set_plugin_proxy_delegate(this);
+  globals->SetPluginProxyDelegate(this);
   globals->set_command_line(
       command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs));
 
   webkit_platform_support_.reset(new PpapiWebKitPlatformSupportImpl);
   blink::initialize(webkit_platform_support_.get());
 
   if (!is_broker_) {
     channel()->AddFilter(
         new ppapi::proxy::PluginMessageFilter(
             NULL, globals->resource_reply_thread_registrar()));
   }
 }
 
 PpapiThread::~PpapiThread() {
 }
 
 void PpapiThread::Shutdown() {
   ChildThread::Shutdown();
 
-  ppapi::proxy::PluginGlobals::Get()->set_plugin_proxy_delegate(NULL);
+  ppapi::proxy::PluginGlobals::Get()->ResetPluginProxyDelegate();
   if (plugin_entry_points_.shutdown_module)
     plugin_entry_points_.shutdown_module();
   webkit_platform_support_->Shutdown();
   blink::shutdown();
 }
 
 bool PpapiThread::Send(IPC::Message* msg) {
   // Allow access from multiple threads.
   if (base::MessageLoop::current() == message_loop())
     return ChildThread::Send(msg);
@@ skipping 402 matching lines @@
       std::string("Plugin.Ppapi") + (is_broker_ ? "Broker" : "Plugin") +
       "LoadErrorCode_" + path.BaseName().MaybeAsASCII();
 
   // For sparse histograms, we can use the macro, as it does not incorporate a
   // static.
   UMA_HISTOGRAM_SPARSE_SLOWLY(histogram_name, error.code);
 #endif
 }
 
 }  // namespace content