Remove ScriptState::current() from IDBRequest

Source/modules/indexeddb/IDBRequestTest.cpp

Index: Source/modules/indexeddb/IDBRequestTest.cpp
diff --git a/Source/modules/indexeddb/IDBRequestTest.cpp b/Source/modules/indexeddb/IDBRequestTest.cpp
index a9dd8fe85de220645d67729fa90d43fd4310e027..43851600a4f220da3d6ba33e366d28fd80173075 100644
--- a/Source/modules/indexeddb/IDBRequestTest.cpp
+++ b/Source/modules/indexeddb/IDBRequestTest.cpp
@@ -74,25 +74,23 @@ NullExecutionContext::NullExecutionContext()
 class IDBRequestTest : public testing::Test {
 public:
     IDBRequestTest()
-        : m_scope(V8ExecutionScope::create(v8::Isolate::GetCurrent()))
-        , m_context(adoptRef(new NullExecutionContext()))
+        : m_scope(V8TestingScope::create(v8::Isolate::GetCurrent()))
     {
+        m_scope->scriptState()->setExecutionContext(adoptRef(new NullExecutionContext()));
     }
 
-    ExecutionContext* executionContext()
-    {
-        return m_context.get();
-    }
+    v8::Isolate* isolate() const { return m_scope->isolate(); }
+    ScriptState* scriptState() const { return m_scope->scriptState(); }
+    ExecutionContext* executionContext() const { return m_scope->scriptState()->executionContext(); }
 
 private:
-    OwnPtr<V8ExecutionScope> m_scope;
-    RefPtr<ExecutionContext> m_context;
+    OwnPtr<V8TestingScope> m_scope;
 };
 
 TEST_F(IDBRequestTest, EventsAfterStopping)
 {
     IDBTransaction* transaction = 0;
-    IDBRequest* request = IDBRequest::create(executionContext(), IDBAny::createUndefined(), transaction);
+    IDBRequest* request = IDBRequest::create(scriptState(), IDBAny::createUndefined(), transaction);
     EXPECT_EQ(request->readyState(), "pending");
     executionContext()->stopActiveDOMObjects();
 
@@ -111,7 +109,7 @@ TEST_F(IDBRequestTest, EventsAfterStopping)
 TEST_F(IDBRequestTest, AbortErrorAfterAbort)
 {
     IDBTransaction* transaction = 0;
-    IDBRequest* request = IDBRequest::create(executionContext(), IDBAny::createUndefined(), transaction);
+    IDBRequest* request = IDBRequest::create(scriptState(), IDBAny::createUndefined(), transaction);
     EXPECT_EQ(request->readyState(), "pending");
 
     // Simulate the IDBTransaction having received onAbort from back end and aborting the request:
@@ -158,7 +156,7 @@ TEST_F(IDBRequestTest, ConnectionsAfterStopping)
 
     {
         OwnPtr<MockWebIDBDatabase> backend = MockWebIDBDatabase::create();
-        IDBOpenDBRequest* request = IDBOpenDBRequest::create(executionContext(), callbacks, transactionId, version);
+        IDBOpenDBRequest* request = IDBOpenDBRequest::create(scriptState(), callbacks, transactionId, version);
         EXPECT_EQ(request->readyState(), "pending");
 
         executionContext()->stopActiveDOMObjects();
@@ -167,7 +165,7 @@ TEST_F(IDBRequestTest, ConnectionsAfterStopping)
 
     {
         OwnPtr<MockWebIDBDatabase> backend = MockWebIDBDatabase::create();
-        IDBOpenDBRequest* request = IDBOpenDBRequest::create(executionContext(), callbacks, transactionId, version);
+        IDBOpenDBRequest* request = IDBOpenDBRequest::create(scriptState(), callbacks, transactionId, version);
         EXPECT_EQ(request->readyState(), "pending");
 
         executionContext()->stopActiveDOMObjects();