Remove ScriptState::current() from IDBRequest

Source/modules/indexeddb/IDBRequestTest.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 56 matching lines @@
 };
 
 NullExecutionContext::NullExecutionContext()
     : m_queue(adoptPtr(new NullEventQueue()))
 {
 }
 
 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();
 
     // Ensure none of the following raise assertions in stopped state:
     request->onError(DOMError::create(AbortError, "Description goes here."));
     request->onSuccess(Vector<String>());
     request->onSuccess(nullptr, IDBKey::createInvalid(), IDBKey::createInvalid(), nullptr, adoptPtr(new Vector<WebBlobInfo>()));
     request->onSuccess(IDBKey::createInvalid());
     request->onSuccess(PassRefPtr<SharedBuffer>(nullptr), adoptPtr(new Vector<WebBlobInfo>()));
     request->onSuccess(PassRefPtr<SharedBuffer>(nullptr), adoptPtr(new Vector<WebBlobInfo>()), IDBKey::createInvalid(), IDBKeyPath());
     request->onSuccess(static_cast<int64_t>(0));
     request->onSuccess();
     request->onSuccess(IDBKey::createInvalid(), IDBKey::createInvalid(), nullptr, adoptPtr(new Vector<WebBlobInfo>()));
 }
 
 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:
     request->abort();
 
     // Now simulate the back end having fired an abort error at the request to clear up any intermediaries.
     // Ensure an assertion is not raised.
     request->onError(DOMError::create(AbortError, "Description goes here."));
 }
 
@@ skipping 26 matching lines @@
 TEST_F(IDBRequestTest, ConnectionsAfterStopping)
 {
     const int64_t transactionId = 1234;
     const int64_t version = 1;
     const int64_t oldVersion = 0;
     const IDBDatabaseMetadata metadata;
     Persistent<IDBDatabaseCallbacks> callbacks = IDBDatabaseCallbacks::create();
 
     {
         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();
         request->onUpgradeNeeded(oldVersion, backend.release(), metadata, blink::WebIDBDataLossNone, String());
     }
 
     {
         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();
         request->onSuccess(backend.release(), metadata);
     }
 }
 
 } // namespace