Never lock the Pepper proxy lock on the IO thread

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 83 matching lines @@
 
 #endif
 
 namespace content {
 
 typedef int32_t (*InitializeBrokerFunc)
     (PP_ConnectInstance_Func* connect_instance_func);
 
 PpapiThread::PpapiThread(const base::CommandLine& command_line, bool is_broker)
     : is_broker_(is_broker),
+      plugin_globals_(GetIOTaskRunner()),
       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->SetPluginProxyDelegate(this);
-  globals->set_command_line(
+  plugin_globals_.SetPluginProxyDelegate(this);
+  plugin_globals_.set_command_line(
       command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs));
 
   blink_platform_impl_.reset(new PpapiBlinkPlatformImpl);
   blink::initialize(blink_platform_impl_.get());
 
   if (!is_broker_) {
-    channel()->AddFilter(
+    scoped_refptr<ppapi::proxy::PluginMessageFilter> plugin_filter(
         new ppapi::proxy::PluginMessageFilter(
-            NULL, globals->resource_reply_thread_registrar()));
+            NULL, plugin_globals_.resource_reply_thread_registrar()));
+    channel()->AddFilter(plugin_filter.get());
+    plugin_globals_.RegisterResourceMessageFilters(plugin_filter.get());
   }
 }
 
 PpapiThread::~PpapiThread() {
 }
 
 void PpapiThread::Shutdown() {
   ChildThreadImpl::Shutdown();
 
   ppapi::proxy::PluginGlobals::Get()->ResetPluginProxyDelegate();
@@ skipping 417 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