Move ScriptState::forWorld/ScriptState::forMainWorld (Part 2)

third_party/WebKit/Source/bindings/core/v8/ScriptPromisePropertyTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/ScriptPromiseProperty.h"
 
 #include <memory>
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScriptFunction.h"
@@ skipping 92 matching lines @@
     m_otherScriptState = ScriptStateForTesting::create(
         v8::Context::New(isolate()),
         DOMWrapperWorld::ensureIsolatedWorld(isolate(), 1));
   }
 
   virtual ~ScriptPromisePropertyTestBase() { destroyContext(); }
 
   Document& document() { return m_page->document(); }
   v8::Isolate* isolate() { return toIsolate(&document()); }
   ScriptState* mainScriptState() {
-    return ScriptState::forMainWorld(document().frame());
+    return toScriptStateForMainWorld(document().frame());
   }
   DOMWrapperWorld& mainWorld() { return mainScriptState()->world(); }
   ScriptState* otherScriptState() { return m_otherScriptState.get(); }
   DOMWrapperWorld& otherWorld() { return m_otherScriptState->world(); }
   ScriptState* currentScriptState() { return ScriptState::current(isolate()); }
 
   void destroyContext() {
     m_page.reset();
     if (m_otherScriptState) {
       m_otherScriptState->disposePerContextData();
@@ skipping 355 matching lines @@
        ResolveWithString) {
   test(String("hello"), "hello", __FILE__, __LINE__);
 }
 
 TEST_F(ScriptPromisePropertyNonScriptWrappableResolutionTargetTest,
        ResolveWithInteger) {
   test(-1, "-1", __FILE__, __LINE__);
 }
 
 }  // namespace blink