Index: ppapi/shared_impl/test_globals.cc |
diff --git a/ppapi/shared_impl/test_globals.cc b/ppapi/shared_impl/test_globals.cc |
index 133b9437dd0b9d2b889e061642bf15dbe401dad4..79f721ed8e19678d42c7486264bdb1d7972ecd17 100644 |
--- a/ppapi/shared_impl/test_globals.cc |
+++ b/ppapi/shared_impl/test_globals.cc |
@@ -9,13 +9,15 @@ namespace ppapi { |
TestGlobals::TestGlobals() |
: ppapi::PpapiGlobals(), |
resource_tracker_(ResourceTracker::THREAD_SAFE), |
- callback_tracker_(new CallbackTracker) { |
+ callback_tracker_(new CallbackTracker), |
+ lock_(NULL) { |
} |
TestGlobals::TestGlobals(PpapiGlobals::PerThreadForTest per_thread_for_test) |
: ppapi::PpapiGlobals(per_thread_for_test), |
resource_tracker_(ResourceTracker::THREAD_SAFE), |
- callback_tracker_(new CallbackTracker) { |
+ callback_tracker_(new CallbackTracker), |
+ lock_(NULL) { |
} |
TestGlobals::~TestGlobals() { |
@@ -56,7 +58,7 @@ void TestGlobals::PreCacheFontForFlash(const void* /* logfontw */) { |
} |
base::Lock* TestGlobals::GetProxyLock() { |
- return NULL; |
+ return lock_; |
} |
void TestGlobals::LogWithSource(PP_Instance instance, |