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

content/renderer/pepper/pepper_url_request_unittest.cc

Index: content/renderer/pepper/pepper_url_request_unittest.cc
diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc
index e9008ec5800c4893ae25b43a632dcee8c83482ce..bd5f3ae37ba713d27ddd366add4bda07c6650e53 100644
--- a/content/renderer/pepper/pepper_url_request_unittest.cc
+++ b/content/renderer/pepper/pepper_url_request_unittest.cc
@@ -59,8 +59,6 @@ class URLRequestInfoTest : public RenderViewTest {
 
   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.
@@ -114,6 +112,9 @@ class URLRequestInfoTest : public RenderViewTest {
 
   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_;