PPAPI: Make tests that disable the proxy lock re-enable it

ppapi/proxy/ppapi_proxy_test.h

 // 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 <map>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "base/threading/thread.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_proxy_delegate.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/plugin_var_tracker.h"
 #include "ppapi/proxy/resource_message_test_sink.h"
+#include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/test_globals.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class MessageLoopProxy;
 class RunLoop;
 }
 
 namespace ppapi {
 namespace proxy {
@@ skipping 250 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(DelegateMock);
   };
 
  private:
   void CreateHostGlobals();
 
   GlobalsConfiguration globals_config_;
   scoped_ptr<ppapi::TestGlobals> host_globals_;
   scoped_ptr<HostDispatcher> host_dispatcher_;
+  // The host side of the real proxy doesn't lock, so this disables locking for
+  // the thread the host side of the test runs on.
+  scoped_ptr<ProxyLock::LockingDisablerForTest> disable_locking_;
   DelegateMock delegate_mock_;
 };
 
 class HostProxyTest : public HostProxyTestHarness, public testing::Test {
  public:
   HostProxyTest();
   virtual ~HostProxyTest();
 
   // testing::Test implementation.
   virtual void SetUp();
@@ skipping 56 matching lines @@
 //   EXPECT_VAR_IS_STRING("foo", my_var);
 #define EXPECT_VAR_IS_STRING(str, var) { \
   StringVar* sv = StringVar::FromPPVar(var); \
   EXPECT_TRUE(sv); \
   if (sv) \
     EXPECT_EQ(str, sv->value()); \
 }
 
 }  // namespace proxy
 }  // namespace ppapi