Remove ScriptState::current() from IDBRequest

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 32 matching lines @@
 
 using namespace WebCore;
 
 using blink::WebIDBDatabase;
 
 namespace {
 
 class IDBTransactionTest : public testing::Test {
 public:
     IDBTransactionTest()
-        : m_scope(V8ExecutionScope::create(v8::Isolate::GetCurrent()))
-        , m_document(Document::create())
+        : m_scope(V8TestingScope::create(v8::Isolate::GetCurrent()))
     {
+        m_scope->scriptState()->setExecutionContext(Document::create());
     }
 
+    v8::Isolate* isolate() const { return m_scope->isolate(); }
+
     ExecutionContext* executionContext()
     {
-        return m_document.get();
+        return m_scope->scriptState()->executionContext();
     }
 
 private:
-    OwnPtr<V8ExecutionScope> m_scope;
-    RefPtr<Document> m_document;
+    OwnPtr<V8TestingScope> m_scope;
 };
 
 class FakeWebIDBDatabase FINAL : public blink::WebIDBDatabase {
 public:
     static PassOwnPtr<FakeWebIDBDatabase> create() { return adoptPtr(new FakeWebIDBDatabase()); }
 
     virtual void commit(long long transactionId) OVERRIDE { }
     virtual void abort(long long transactionId) OVERRIDE { }
     virtual void close() OVERRIDE { }
 
@@ skipping 24 matching lines @@
     PersistentHeapHashSet<WeakMember<IDBTransaction> > set;
     set.add(transaction);
 
     Heap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 #else
     // Local reference, IDBDatabase's reference and IDBPendingTransactionMonitor's reference:
     EXPECT_EQ(3, transaction->refCount());
 #endif
 
-    RefPtrWillBePersistent<IDBRequest> request = IDBRequest::create(executionContext(), IDBAny::createUndefined(), transaction.get());
+    RefPtrWillBePersistent<IDBRequest> request = IDBRequest::create(ScriptState::current(isolate()), IDBAny::createUndefined(), transaction.get());

[jsbell, 2014/05/27 18:38:47]

Just isolate() here rather than ScriptState::current(isolate()) ?

[haraken, 2014/05/28 00:35:49]

Done.

     IDBPendingTransactionMonitor::from(*executionContext()).deactivateNewTransactions();
 
 #if ENABLE(OILPAN)
     Heap::collectAllGarbage();
     EXPECT_EQ(1u, set.size());
 #else
     // Local reference and  IDBDatabase's reference., and the IDBRequest's reference
     EXPECT_EQ(3, transaction->refCount());
 #endif
 
@@ skipping 63 matching lines @@
     // onAbort() should have cleared the transaction's reference to the database.
 #if ENABLE(OILPAN)
     Heap::collectAllGarbage();
     EXPECT_EQ(0u, set.size());
 #else
     EXPECT_EQ(1, db->refCount());
 #endif
 }
 
 } // namespace