Drop V8RecursionScope dependency on ExecutionContext

Source/modules/indexeddb/IDBTransactionTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/indexeddb/IDBTransaction.h"
 
 #include "core/dom/DOMError.h"
 #include "core/dom/Document.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBDatabaseCallbacks.h"
-#include "modules/indexeddb/IDBPendingTransactionMonitor.h"
 #include "platform/SharedBuffer.h"
 #include "public/platform/WebIDBDatabase.h"
 #include <gtest/gtest.h>
 #include <v8.h>
 
 namespace blink {
 namespace {
 
 class IDBTransactionTest : public testing::Test {
 public:
     IDBTransactionTest()
         : m_scope(v8::Isolate::GetCurrent())
         , m_executionContext(Document::create())
     {
         m_scope.scriptState()->setExecutionContext(m_executionContext.get());
     }
 
     ~IDBTransactionTest()
     {
         m_scope.scriptState()->setExecutionContext(0);
     }
 
     v8::Isolate* isolate() const { return m_scope.isolate(); }
     ScriptState* scriptState() const { return m_scope.scriptState(); }
     ExecutionContext* executionContext() { return m_scope.scriptState()->executionContext(); }
 
+    void deactivateNewTransactions()
+    {
+        V8PerIsolateData::from(isolate())->ensureIDBPendingTransactionMonitor()->deactivateNewTransactions();
+    }
+
 private:
     V8TestingScope m_scope;
     RefPtrWillBePersistent<ExecutionContext> m_executionContext;
 };
 
 class FakeWebIDBDatabase FINAL : public WebIDBDatabase {
 public:
     static PassOwnPtr<FakeWebIDBDatabase> create() { return adoptPtr(new FakeWebIDBDatabase()); }
 
     virtual void commit(long long transactionId) OVERRIDE { }
@@ skipping 23 matching lines @@
     const int64_t transactionId = 1234;
     const Vector<String> transactionScope;
     Persistent<IDBTransaction> transaction = IDBTransaction::create(scriptState(), transactionId, transactionScope, WebIDBTransactionModeReadOnly, db.get());
     PersistentHeapHashSet<WeakMember<IDBTransaction> > set;
     set.add(transaction);
 
     Heap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
     Persistent<IDBRequest> request = IDBRequest::create(scriptState(), IDBAny::createUndefined(), transaction.get());
-    IDBPendingTransactionMonitor::from(*executionContext()).deactivateNewTransactions();
+    deactivateNewTransactions();
 
     Heap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
     // This will generate an abort() call to the back end which is dropped by the fake proxy,
     // so an explicit onAbort call is made.
     executionContext()->stopActiveDOMObjects();
     transaction->onAbort(DOMError::create(AbortError, "Aborted"));
     transaction.clear();
 
     Heap::collectAllGarbage();
     EXPECT_EQ(0u, set.size());
 }
 
 TEST_F(IDBTransactionTest, TransactionFinish)
 {
     OwnPtr<FakeWebIDBDatabase> backend = FakeWebIDBDatabase::create();
     Persistent<IDBDatabase> db = IDBDatabase::create(executionContext(), backend.release(), FakeIDBDatabaseCallbacks::create());
 
     const int64_t transactionId = 1234;
     const Vector<String> transactionScope;
     Persistent<IDBTransaction> transaction = IDBTransaction::create(scriptState(), transactionId, transactionScope, WebIDBTransactionModeReadOnly, db.get());
     PersistentHeapHashSet<WeakMember<IDBTransaction> > set;
     set.add(transaction);
 
     Heap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
-    IDBPendingTransactionMonitor::from(*executionContext()).deactivateNewTransactions();
+    deactivateNewTransactions();
 
     Heap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
     transaction.clear();
 
     Heap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 
     // Stop the context, so events don't get queued (which would keep the transaction alive).
     executionContext()->stopActiveDOMObjects();
 
     // Fire an abort to make sure this doesn't free the transaction during use. The test
     // will not fail if it is, but ASAN would notice the error.
     db->onAbort(transactionId, DOMError::create(AbortError, "Aborted"));
 
     // onAbort() should have cleared the transaction's reference to the database.
     Heap::collectAllGarbage();
     EXPECT_EQ(0u, set.size());
 }
 
 } // namespace
 } // namespace blink