Revert of Ensure DOMWrapperWorld always exists in all webkit_unit_tests

Source/bindings/v8/ScriptPromiseTest.cpp

 /*
  * Copyright (C) 2014 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 ScriptPromiseTest : public testing::Test {
 public:
     ScriptPromiseTest()
         : 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);
     }
 
     void TearDown()
     {
-        m_scope.clear();
+        m_perContextData.clear();
     }
 
     V8PromiseCustom::PromiseState state(ScriptPromise promise)
     {
         return V8PromiseCustom::getState(V8PromiseCustom::getInternal(promise.v8Value().As<v8::Object>()));
     }
 
 protected:
     v8::Isolate* m_isolate;
-
-private:
-    OwnPtr<V8BindingTestScope> m_scope;
+    v8::HandleScope m_handleScope;
+    ScopedPersistent<v8::Context> m_context;
+    v8::Context::Scope m_contextScope;
+    OwnPtr<V8PerContextData> m_perContextData;
 };
 
 TEST_F(ScriptPromiseTest, castPromise)
 {
     ScriptPromise promise = ScriptPromise::createPending();
     ScriptPromise newPromise(ScriptValue(promise.v8Value(), m_isolate));
 
     ASSERT_FALSE(promise.hasNoValue());
     EXPECT_EQ(V8PromiseCustom::Pending, state(promise));
     EXPECT_EQ(promise.v8Value(), newPromise.v8Value());
@@ skipping 12 matching lines @@
     ASSERT_TRUE(V8PromiseCustom::isPromise(promise2.v8Value(), m_isolate));
 
     EXPECT_EQ(V8PromiseCustom::Fulfilled, state(promise1));
     EXPECT_EQ(V8PromiseCustom::Fulfilled, state(promise2));
     EXPECT_NE(promise1.v8Value(), promise2.v8Value());
 }
 
 } // namespace
 
 } // namespace WebCore