V8AbstractEventListener should hold a ScriptState

Source/web/tests/CustomEventTest.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 37 matching lines @@
 
 #include <gtest/gtest.h>
 
 using namespace WebCore;
 using namespace blink;
 
 namespace {
 
 class TestListener : public V8AbstractEventListener {
 public:
-    virtual bool operator==(const EventListener& listener)
+    virtual bool operator==(const EventListener&)
     {
         return true;
     }
 
     virtual void handleEvent(ExecutionContext* context, Event* event)
     {
         EXPECT_EQ(event->type(), "blah");
 
-        v8::Local<v8::Context> v8Context = WebCore::toV8Context(context, DOMWrapperWorld::mainWorld());
-        v8::Isolate* isolate = v8Context->GetIsolate();
-        v8::Context::Scope scope(v8Context);
-        v8::Handle<v8::Value> jsEvent = toV8(event, v8::Handle<v8::Object>(), isolate);
+        ScriptState::Scope scope(scriptState());
+        v8::Handle<v8::Value> jsEvent = toV8(event, scriptState()->context()->Global(), isolate());
 
-        EXPECT_EQ(jsEvent->ToObject()->Get(v8::String::NewFromUtf8(isolate, "detail")), v8::Boolean::New(isolate, true));
+        EXPECT_EQ(jsEvent->ToObject()->Get(v8::String::NewFromUtf8(scriptState()->isolate(), "detail")), v8::Boolean::New(scriptState()->isolate(), true));
     }
 
-    static PassRefPtr<TestListener> create(v8::Isolate* isolate, DOMWrapperWorld& world)
+    static PassRefPtr<TestListener> create(ScriptState* scriptState)
     {
-        return adoptRef(new TestListener(isolate, world));
+        return adoptRef(new TestListener(scriptState));
     }
 
 private:
-    TestListener(v8::Isolate* isolate, DOMWrapperWorld& world)
-        : V8AbstractEventListener(false, world, isolate)
+    TestListener(ScriptState* scriptState)
+        : V8AbstractEventListener(false, scriptState)
     {
     }
 
     virtual v8::Local<v8::Value> callListenerFunction(ExecutionContext*, v8::Handle<v8::Value> jsevent, Event*)
     {
         ASSERT_NOT_REACHED();
         return v8::Local<v8::Value>();
     }
 };
 
@@ skipping 10 matching lines @@
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8(path.c_str()));
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webViewHelper.initializeAndLoad(baseURL + path)->mainFrame());
     WebDOMEvent event = frame->frame()->document()->createEvent("CustomEvent", IGNORE_EXCEPTION);
     WebDOMCustomEvent customEvent = event.to<WebDOMCustomEvent>();
 
     v8::Isolate* isolate = toIsolate(frame->frame());
     V8TestingScope scope(isolate);
     customEvent.initCustomEvent("blah", false, false, WebSerializedScriptValue::serialize(v8::Boolean::New(isolate, true)));
-    RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::create();
-    RefPtr<EventListener> listener = TestListener::create(isolate, *world);
+    RefPtr<EventListener> listener = TestListener::create(ScriptState::current(isolate));
     frame->frame()->document()->addEventListener("blah", listener, false);
     frame->frame()->document()->dispatchEvent(event);
 
     Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
 }
 
 }