PPAPI: Make tests that disable the proxy lock re-enable it

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/bind.h"
 #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() : 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_;
@@ skipping 293 matching lines @@
   resource->CheckFinalState();
 
   // This shouldn't be needed, but make sure there are no stranded tasks.
   {
     ProxyAutoUnlock unlock;
     base::MessageLoop::current()->RunUntilIdle();
   }
 }
 
 }  // namespace ppapi