| 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 080c884726d625461e6e58fdc801e47da9f00a84..d884665ba587cc4d7ae2cc7801862d3323860bbd 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_);
|
|
|
|
|