diff options
| author | dmichael <dmichael@chromium.org> | 2015-02-11 16:58:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-12 00:58:54 +0000 |
| commit | bd96c1e0f3c41f2254600c1285916f52ff29b92c (patch) | |
| tree | ef02ab28baa9d4bbd73470d49ea9a9e7e9240b37 /content/renderer/pepper/pepper_url_request_unittest.cc | |
| parent | 7e58cd2ca21f020e349893fbd310ade83cf27f47 (diff) | |
| download | chromium_src-bd96c1e0f3c41f2254600c1285916f52ff29b92c.zip chromium_src-bd96c1e0f3c41f2254600c1285916f52ff29b92c.tar.gz chromium_src-bd96c1e0f3c41f2254600c1285916f52ff29b92c.tar.bz2 | |
PPAPI: Make tests that disable the proxy lock re-enable it
Rather than force all unit tests that rely on the ProxyLock to enable it,
let's make sure that all tests that _disable_ it re-enable it on exit.
BUG=
R=teravest@chromium.org
Committed: https://crrev.com/25ea5b2087b4c31fa42dea9b0de759d4895d0612
Cr-Commit-Position: refs/heads/master@{#315666}
Review URL: https://codereview.chromium.org/908363002
Cr-Commit-Position: refs/heads/master@{#315895}
Diffstat (limited to 'content/renderer/pepper/pepper_url_request_unittest.cc')
| -rw-r--r-- | content/renderer/pepper/pepper_url_request_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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_; |