Revert of Ensure DOMWrapperWorld always exists in all webkit_unit_tests

Source/bindings/v8/ScriptPromiseResolverTest.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 29 matching lines @@
 #include <v8.h>
 
 namespace WebCore {
 
 namespace {
 
 class ScriptPromiseResolverTest : public testing::Test {
 public:
     ScriptPromiseResolverTest()
         : m_isolate(v8::Isolate::GetCurrent())
+        , m_handleScope(m_isolate)
+        , m_context(m_isolate, v8::Context::New(m_isolate))
+        , m_contextScope(m_context.newLocal(m_isolate))
     {
     }
 
     void SetUp()
     {
-        m_scope = V8BindingTestScope::create(m_isolate);
+        // FIXME: Create a new world and pass it to V8PerContextData.
+        m_perContextData = V8PerContextData::create(m_context.newLocal(m_isolate), 0);
         m_promise = ScriptPromise::createPending();
         m_resolver = ScriptPromiseResolver::create(m_promise);
     }
 
     void TearDown()
     {
         m_resolver = nullptr;
         m_promise.clear();
-        m_scope.clear();
+        m_perContextData.clear();
     }
 
     V8PromiseCustom::PromiseState state()
     {
         return V8PromiseCustom::getState(V8PromiseCustom::getInternal(promise()));
     }
 
     v8::Local<v8::Value> result()
     {
         return V8PromiseCustom::getInternal(promise())->GetInternalField(V8PromiseCustom::InternalResultIndex);
     }
 
     v8::Local<v8::Object> promise()
     {
         ASSERT(!m_promise.hasNoValue());
         return m_promise.v8Value().As<v8::Object>();
     }
 
 protected:
     v8::Isolate* m_isolate;
+    v8::HandleScope m_handleScope;
+    ScopedPersistent<v8::Context> m_context;
+    v8::Context::Scope m_contextScope;
     RefPtr<ScriptPromiseResolver> m_resolver;
     ScriptPromise m_promise;
-private:
-    OwnPtr<V8BindingTestScope> m_scope;
+    OwnPtr<V8PerContextData> m_perContextData;
 };
 
 TEST_F(ScriptPromiseResolverTest, initialState)
 {
     EXPECT_TRUE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Pending, state());
     EXPECT_TRUE(result()->IsUndefined());
 }
 
 TEST_F(ScriptPromiseResolverTest, resolve)
@@ skipping 60 matching lines @@
     m_resolver->reject(ScriptValue(v8::Integer::New(m_isolate, 4), m_isolate));
     EXPECT_FALSE(m_resolver->isPending());
     EXPECT_EQ(V8PromiseCustom::Fulfilled, state());
     ASSERT_TRUE(result()->IsNumber());
     EXPECT_EQ(3, result().As<v8::Integer>()->Value());
 }
 
 } // namespace
 
 } // namespace WebCore