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 20e7f92ecec43cb4d08eb43a6400bfd4560cee7a..fb3e7205052641b08cb898ff14c32a8c5dda1f1b 100644 |
--- a/content/renderer/pepper/pepper_url_request_unittest.cc |
+++ b/content/renderer/pepper/pepper_url_request_unittest.cc |
@@ -7,6 +7,7 @@ |
#include "content/renderer/pepper/url_request_info_util.h" |
#include "ppapi/proxy/connection.h" |
#include "ppapi/proxy/url_request_info_resource.h" |
+#include "ppapi/shared_impl/proxy_lock.h" |
#include "ppapi/shared_impl/test_globals.h" |
#include "ppapi/shared_impl/url_request_info_data.h" |
#include "ppapi/thunk/thunk.h" |
@@ -60,6 +61,7 @@ class URLRequestInfoTest : public RenderViewTest { |
virtual void SetUp() OVERRIDE { |
RenderViewTest::SetUp(); |
+ ppapi::ProxyLock::DisableLockingOnThreadForTest(); |
test_globals_.GetResourceTracker()->DidCreateInstance(pp_instance_); |