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

third_party/WebKit/Source/bindings/core/v8/ScriptState.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/ScriptState.h"
 
 #include "bindings/core/v8/V8Binding.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 64 matching lines @@
 void ScriptState::setExecutionContext(ExecutionContext*) {
   ASSERT_NOT_REACHED();
 }
 
 LocalDOMWindow* ScriptState::domWindow() const {
   v8::HandleScope scope(m_isolate);
   return toLocalDOMWindow(context());
 }
 
 ScriptState* ScriptState::forMainWorld(LocalFrame* frame) {
-  return ScriptState::forWorld(frame, DOMWrapperWorld::mainWorld());
+  return toScriptStateForMainWorld(frame);
 }
 
 ScriptState* ScriptState::forWorld(LocalFrame* frame, DOMWrapperWorld& world) {
-  ASSERT(frame);
-  v8::HandleScope handleScope(toIsolate(frame));
-  v8::Local<v8::Context> context = toV8Context(frame, world);
-  if (context.IsEmpty())
-    return nullptr;
-  ScriptState* scriptState = ScriptState::from(context);
-  ASSERT(scriptState->contextIsValid());
-  return scriptState;
+  return toScriptState(frame, world);
 }
 
 }  // namespace blink