Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / indexeddb / IDBTransactionTest.cpp

diff --git a/src/third_party/WebKit/Source/modules/indexeddb/IDBTransactionTest.cpp b/src/third_party/WebKit/Source/modules/indexeddb/IDBTransactionTest.cpp
index 074b0d3..7342d23 100644 (file)
--- a/src/third_party/WebKit/Source/modules/indexeddb/IDBTransactionTest.cpp
+++ b/src/third_party/WebKit/Source/modules/indexeddb/IDBTransactionTest.cpp
@@ -35,7 +35,6 @@
 #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>
@@ -62,6 +61,11 @@ public:
     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;
@@ -97,7 +101,7 @@ TEST_F(IDBTransactionTest, EnsureLifetime)
 
     const int64_t transactionId = 1234;
     const Vector<String> transactionScope;
-    Persistent<IDBTransaction> transaction = IDBTransaction::create(executionContext(), transactionId, transactionScope, WebIDBTransactionModeReadOnly, db.get());
+    Persistent<IDBTransaction> transaction = IDBTransaction::create(scriptState(), transactionId, transactionScope, WebIDBTransactionModeReadOnly, db.get());
     PersistentHeapHashSet<WeakMember<IDBTransaction> > set;
     set.add(transaction);
 
@@ -105,7 +109,7 @@ TEST_F(IDBTransactionTest, EnsureLifetime)
     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());
@@ -127,14 +131,14 @@ TEST_F(IDBTransactionTest, TransactionFinish)
 
     const int64_t transactionId = 1234;
     const Vector<String> transactionScope;
-    Persistent<IDBTransaction> transaction = IDBTransaction::create(executionContext(), transactionId, transactionScope, WebIDBTransactionModeReadOnly, db.get());
+    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());