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

content/renderer/pepper/pepper_url_request_unittest.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 "base/compiler_specific.h"
 #include "content/public/common/user_agent.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/pepper/url_request_info_util.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/url_request_info_resource.h"
@@ skipping 41 matching lines @@
 namespace content {
 
 class URLRequestInfoTest : public RenderViewTest {
  public:
   // Note: using -1 as the instance value allows code in
   // url_request_info_util.cc to detect that this is a test instance.
   URLRequestInfoTest() : pp_instance_(-1) {}
 
   void SetUp() override {
     RenderViewTest::SetUp();
-    ppapi::ProxyLock::DisableLockingOnThreadForTest();
-
     test_globals_.GetResourceTracker()->DidCreateInstance(pp_instance_);
 
     // This resource doesn't do IPC, so a null connection is fine.
     info_ = new URLRequestInfoResource(
         ppapi::proxy::Connection(), pp_instance_, URLRequestInfoData());
   }
 
   void TearDown() override {
     test_globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_);
     RenderViewTest::TearDown();
@@ skipping 33 matching lines @@
 
   bool SetBooleanProperty(PP_URLRequestProperty prop, bool b) {
     return info_->SetBooleanProperty(prop, b);
   }
   bool SetStringProperty(PP_URLRequestProperty prop, const std::string& s) {
     return info_->SetStringProperty(prop, s);
   }
 
   PP_Instance pp_instance_;
 
+  // Disables locking for the duration of the test.
+  ppapi::ProxyLock::LockingDisablerForTest disable_locking_;
+
   // Needs to be alive for resource tracking to work.
   ppapi::TestGlobals test_globals_;
 
   scoped_refptr<URLRequestInfoResource> info_;
 };
 
 TEST_F(URLRequestInfoTest, GetInterface) {
   const PPB_URLRequestInfo* request_info =
       ppapi::thunk::GetPPB_URLRequestInfo_1_0_Thunk();
   EXPECT_TRUE(request_info);
@@ skipping 106 matching lines @@
   // Test that we can set multiple header fields using \n delimiter.
   EXPECT_TRUE(
       SetStringProperty(PP_URLREQUESTPROPERTY_HEADERS, "foo: bar\nbar: baz"));
   EXPECT_TRUE(IsExpected(GetHeaderValue("foo"), "bar"));
   EXPECT_TRUE(IsExpected(GetHeaderValue("bar"), "baz"));
 }
 
 // TODO(bbudge) Unit tests for AppendDataToBody, AppendFileToBody.
 
 }  // namespace content