Revert of 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 52 matching lines @@
 
     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_);
-    // Turn locking back to the default for tests that run later.
-    ppapi::ProxyLock::EnableLockingOnThreadForTest();
     RenderViewTest::TearDown();
   }
 
   bool GetDownloadToFile() {
     WebURLRequest web_request;
     URLRequestInfoData data = info_->GetData();
     if (!CreateWebURLRequest(pp_instance_, &data, GetMainFrame(), &web_request))
       return false;
     return web_request.downloadToFile();
   }
@@ skipping 150 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