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

content/renderer/pepper/pepper_file_chooser_host_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/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/test/render_view_test.h"
@@ skipping 18 matching lines @@
 
 namespace {
 
 class PepperFileChooserHostTest : public RenderViewTest {
  public:
   PepperFileChooserHostTest() : pp_instance_(123456) {}
 
   void SetUp() override {
     SetContentClient(&client_);
     RenderViewTest::SetUp();
-    ppapi::ProxyLock::DisableLockingOnThreadForTest();
 
     globals_.GetResourceTracker()->DidCreateInstance(pp_instance_);
   }
   void TearDown() override {
     globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_);
 
     RenderViewTest::TearDown();
   }
 
   PP_Instance pp_instance() const { return pp_instance_; }
 
  private:
   PP_Instance pp_instance_;
 
+  // Disables locking for the duration of the test.
+  ppapi::ProxyLock::LockingDisablerForTest disable_locking_;
   ppapi::TestGlobals globals_;
   TestContentClient client_;
 };
 
 // For testing to convert our hardcoded file paths to 8-bit.
 std::string FilePathToUTF8(const base::FilePath::StringType& path) {
 #if defined(OS_WIN)
   return base::UTF16ToUTF8(path);
 #else
   return path;
@@ skipping 78 matching lines @@
   accept.push_back("text/plain");
   PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept);
 
   ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0);
   ppapi::host::HostMessageContext context(call_params);
   int32 result = chooser.OnResourceMessageReceived(show_msg, &context);
   EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result);
 }
 
 }  // namespace content