PPAPI: Purposely leak ProxyLock, fix shutdown race

content/renderer/pepper/v8_var_converter_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 "content/renderer/pepper/v8_var_converter.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 120 matching lines @@
 }
 
 class V8VarConverterTest : public testing::Test {
  public:
   V8VarConverterTest()
       : isolate_(v8::Isolate::GetCurrent()) {}
   virtual ~V8VarConverterTest() {}
 
   // testing::Test implementation.
   virtual void SetUp() {
-    ProxyLock::Acquire();
+    ppapi::ProxyLock::DisableLockingOnThreadForTest();
     v8::HandleScope handle_scope(isolate_);
     v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New();
     context_.Reset(isolate_, v8::Context::New(isolate_, NULL, global));
   }
   virtual void TearDown() {
     context_.Dispose();
     ASSERT_TRUE(PpapiGlobals::Get()->GetVarTracker()->GetLiveVars().empty());
     ProxyLock::Release();
   }
 
@@ skipping 224 matching lines @@
     ScopedPPVar oops(ScopedPPVar::PassRef(), StringVar::StringToPPVar("oops"));
     expected->SetWithStringKey("undefined", oops.get());
     ScopedPPVar release_expected(
         ScopedPPVar::PassRef(), expected->GetPPVar());
 
     ASSERT_TRUE(TestEqual(release_expected.get(), release_actual.get()));
   }
 }
 
 }  // namespace content