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

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

Index: third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
index ffa410854cae6c8514db28e7cac8c300ce269dbe..a6868e5ebaae865d953a750241d7a3bed53c9838 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
@@ -82,18 +82,11 @@ LocalDOMWindow* ScriptState::domWindow() const {
 }
 
 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