Never lock the Pepper proxy lock on the IO thread

ppapi/proxy/ppapi_proxy_test.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 "ppapi/proxy/ppapi_proxy_test.h"
 
 #include <sstream>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 145 matching lines @@
 PpapiGlobals* PluginProxyTestHarness::GetGlobals() {
   return plugin_globals_.get();
 }
 
 Dispatcher* PluginProxyTestHarness::GetDispatcher() {
   return plugin_dispatcher_.get();
 }
 
 void PluginProxyTestHarness::SetUpHarness() {
   // These must be first since the dispatcher set-up uses them.
-  CreatePluginGlobals();
+  CreatePluginGlobals(nullptr /* ipc_task_runner */);
   // Some of the methods called during set-up check that the lock is held.
   ProxyAutoLock lock;
 
   resource_tracker().DidCreateInstance(pp_instance());
 
   plugin_dispatcher_.reset(new PluginDispatcher(
       &MockGetInterface,
       PpapiPermissions(),
       false));
   plugin_dispatcher_->InitWithTestSink(&sink());
   // The plugin proxy delegate is needed for
   // |PluginProxyDelegate::GetBrowserSender| which is used
   // in |ResourceCreationProxy::GetConnection| to get the channel to the
   // browser. In this case we just use the |plugin_dispatcher_| as the channel
   // for test purposes.
   plugin_delegate_mock_.set_browser_sender(plugin_dispatcher_.get());
   PluginGlobals::Get()->SetPluginProxyDelegate(&plugin_delegate_mock_);
   plugin_dispatcher_->DidCreateInstance(pp_instance());
 }
 
 void PluginProxyTestHarness::SetUpHarnessWithChannel(
     const IPC::ChannelHandle& channel_handle,
     base::MessageLoopProxy* ipc_message_loop,
     base::WaitableEvent* shutdown_event,
     bool is_client) {
   // These must be first since the dispatcher set-up uses them.
-  CreatePluginGlobals();
+  scoped_refptr<base::TaskRunner> ipc_task_runner(ipc_message_loop);
+  CreatePluginGlobals(ipc_message_loop);
   // Some of the methods called during set-up check that the lock is held.
   ProxyAutoLock lock;
 
   resource_tracker().DidCreateInstance(pp_instance());
   plugin_delegate_mock_.Init(ipc_message_loop, shutdown_event);
 
   plugin_dispatcher_.reset(new PluginDispatcher(
       &MockGetInterface,
       PpapiPermissions(),
       false));
@@ skipping 12 matching lines @@
     ProxyAutoLock lock;
 
     plugin_dispatcher_->DidDestroyInstance(pp_instance());
     plugin_dispatcher_.reset();
 
     resource_tracker().DidDeleteInstance(pp_instance());
   }
   plugin_globals_.reset();
 }
 
-void PluginProxyTestHarness::CreatePluginGlobals() {
+void PluginProxyTestHarness::CreatePluginGlobals(
+    const scoped_refptr<base::TaskRunner>& ipc_task_runner) {
   if (globals_config_ == PER_THREAD_GLOBALS) {
-    plugin_globals_.reset(new PluginGlobals(PpapiGlobals::PerThreadForTest()));
+    plugin_globals_.reset(new PluginGlobals(PpapiGlobals::PerThreadForTest(),
+                                            ipc_task_runner));
     PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
   } else {
-    plugin_globals_.reset(new PluginGlobals());
+    plugin_globals_.reset(new PluginGlobals(ipc_task_runner));
   }
 }
 
 base::MessageLoopProxy*
 PluginProxyTestHarness::PluginDelegateMock::GetIPCMessageLoop() {
   return ipc_message_loop_;
 }
 
 base::WaitableEvent*
 PluginProxyTestHarness::PluginDelegateMock::GetShutdownEvent() {
@@ skipping 332 matching lines @@
   plugin_thread_.message_loop_proxy()->PostTask(FROM_HERE,
       base::Bind(&RunTaskOnRemoteHarness,
                  task,
                  &task_complete));
   task_complete.Wait();
 }
 
 
 }  // namespace proxy
 }  // namespace ppapi