PPAPI: Purposely leak ProxyLock, fix shutdown race

ppapi/shared_impl/tracked_callback_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/callback_tracker.h"
+#include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/test_globals.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ppapi {
 
 namespace {
 
 class TrackedCallbackTest : public testing::Test {
  public:
   TrackedCallbackTest()
       : message_loop_(base::MessageLoop::TYPE_DEFAULT), pp_instance_(1234) {}
 
   PP_Instance pp_instance() const { return pp_instance_; }
 
   virtual void SetUp() OVERRIDE {
+    ProxyLock::EnableLockingOnThreadForTest();
+    ProxyAutoLock lock;
     globals_.GetResourceTracker()->DidCreateInstance(pp_instance_);
   }
   virtual void TearDown() OVERRIDE {
+    ProxyAutoLock lock;
     globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_);
   }
 
  private:
   base::MessageLoop message_loop_;
   TestGlobals globals_;
   PP_Instance pp_instance_;
 };
 
 struct CallbackRunInfo {
@@ skipping 31 matching lines @@
  private:
   CallbackRunInfo info_did_run_;
   CallbackRunInfo info_did_abort_;
   CallbackRunInfo info_didnt_run_;
 };
 
 }  // namespace
 
 // Tests that callbacks are properly aborted on module shutdown.
 TEST_F(CallbackShutdownTest, AbortOnShutdown) {
+  ProxyAutoLock lock;
   scoped_refptr<Resource> resource(new Resource(OBJECT_IS_IMPL, pp_instance()));
 
   // Set up case (1) (see above).
   EXPECT_EQ(0U, info_did_run().run_count);
   scoped_refptr<TrackedCallback> callback_did_run = new TrackedCallback(
       resource.get(),
       PP_MakeCompletionCallback(&TestCallback, &info_did_run()));
   EXPECT_EQ(0U, info_did_run().run_count);
   callback_did_run->Run(PP_OK);
   EXPECT_EQ(1U, info_did_run().run_count);
@@ skipping 97 matching lines @@
   CallbackRunInfo info_did_abort_;
 
   scoped_refptr<TrackedCallback> callback_didnt_run_;
   CallbackRunInfo info_didnt_run_;
 };
 
 }  // namespace
 
 // Test that callbacks get aborted on the last resource unref.
 TEST_F(CallbackResourceTest, AbortOnNoRef) {
+  ProxyAutoLock lock;
   ResourceTracker* resource_tracker =
       PpapiGlobals::Get()->GetResourceTracker();
 
   // Test several things: Unref-ing a resource (to zero refs) with callbacks
   // which (1) have been run, (2) have been aborted, (3) haven't been completed.
   // Check that the uncompleted one gets aborted, and that the others don't get
   // called again.
   scoped_refptr<CallbackMockResource> resource_1(
       new CallbackMockResource(pp_instance()));
   PP_Resource resource_1_id = resource_1->SetupForTest();
 
   // Also do the same for a second resource, and make sure that unref-ing the
   // first resource doesn't much up the second resource.
   scoped_refptr<CallbackMockResource> resource_2(
       new CallbackMockResource(pp_instance()));
   PP_Resource resource_2_id = resource_2->SetupForTest();
 
   // Double-check that resource #1 is still okay.
   resource_1->CheckIntermediateState();
 
   // Kill resource #1, spin the message loop to run posted calls, and check that
   // things are in the expected states.
   resource_tracker->ReleaseResource(resource_1_id);
-  base::MessageLoop::current()->RunUntilIdle();
+  {
+    ProxyAutoUnlock unlock;
+    base::MessageLoop::current()->RunUntilIdle();
+  }
   resource_1->CheckFinalState();
   resource_2->CheckIntermediateState();
 
   // Kill resource #2.
   resource_tracker->ReleaseResource(resource_2_id);
-  base::MessageLoop::current()->RunUntilIdle();
+  {
+    ProxyAutoUnlock unlock;
+    base::MessageLoop::current()->RunUntilIdle();
+  }
   resource_1->CheckFinalState();
   resource_2->CheckFinalState();
 
   // This shouldn't be needed, but make sure there are no stranded tasks.
-  base::MessageLoop::current()->RunUntilIdle();
+  {
+    ProxyAutoUnlock unlock;
+    base::MessageLoop::current()->RunUntilIdle();
+  }
 }
 
 // Test that "resurrecting" a resource (getting a new ID for a |Resource|)
 // doesn't resurrect callbacks.
 TEST_F(CallbackResourceTest, Resurrection) {
+  ProxyAutoLock lock;
   ResourceTracker* resource_tracker =
       PpapiGlobals::Get()->GetResourceTracker();
 
   scoped_refptr<CallbackMockResource> resource(
       new CallbackMockResource(pp_instance()));
   PP_Resource resource_id = resource->SetupForTest();
 
   // Unref it, spin the message loop to run posted calls, and check that things
   // are in the expected states.
   resource_tracker->ReleaseResource(resource_id);
-  base::MessageLoop::current()->RunUntilIdle();
+  {
+    ProxyAutoUnlock unlock;
+    base::MessageLoop::current()->RunUntilIdle();
+  }
   resource->CheckFinalState();
 
   // "Resurrect" it and check that the callbacks are still dead.
   PP_Resource new_resource_id = resource->GetReference();
-  base::MessageLoop::current()->RunUntilIdle();
+  {
+    ProxyAutoUnlock unlock;
+    base::MessageLoop::current()->RunUntilIdle();
+  }
   resource->CheckFinalState();
 
   // Unref it again and do the same.
   resource_tracker->ReleaseResource(new_resource_id);
-  base::MessageLoop::current()->RunUntilIdle();
+  {
+    ProxyAutoUnlock unlock;
+    base::MessageLoop::current()->RunUntilIdle();
+  }
   resource->CheckFinalState();
 
   // This shouldn't be needed, but make sure there are no stranded tasks.
-  base::MessageLoop::current()->RunUntilIdle();
+  {
+    ProxyAutoUnlock unlock;
+    base::MessageLoop::current()->RunUntilIdle();
+  }
 }
 
 }  // namespace ppapi