diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/pepper/pepper_file_chooser_host_unittest.cc | 3 | ||||
| -rw-r--r-- | content/renderer/pepper/pepper_url_request_unittest.cc | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc index bfc88e6..0585b04 100644 --- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc +++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc @@ -36,7 +36,6 @@ class PepperFileChooserHostTest : public RenderViewTest { void SetUp() override { SetContentClient(&client_); RenderViewTest::SetUp(); - ppapi::ProxyLock::DisableLockingOnThreadForTest(); globals_.GetResourceTracker()->DidCreateInstance(pp_instance_); } @@ -51,6 +50,8 @@ class PepperFileChooserHostTest : public RenderViewTest { private: PP_Instance pp_instance_; + // Disables locking for the duration of the test. + ppapi::ProxyLock::LockingDisablerForTest disable_locking_; ppapi::TestGlobals globals_; TestContentClient client_; }; diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc index e9008ec..bd5f3ae 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_; |