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

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

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. 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
@@ skipping 289 matching lines @@
 v8::Local<v8::Value> ScriptController::evaluateScriptInMainWorld(
     const ScriptSourceCode& sourceCode,
     AccessControlStatus accessControlStatus,
     ExecuteScriptPolicy policy) {
   if (policy == DoNotExecuteScriptWhenScriptsDisabled &&
       !frame()->document()->canExecuteScripts(AboutToExecuteScript))
     return v8::Local<v8::Value>();
 
   // TODO(dcheng): Clean this up to not use ScriptState, to match
   // executeScriptInIsolatedWorld.
-  ScriptState* scriptState = ScriptState::forMainWorld(frame());
+  ScriptState* scriptState = toScriptStateForMainWorld(frame());
   if (!scriptState)
     return v8::Local<v8::Value>();
   v8::EscapableHandleScope handleScope(isolate());
   ScriptState::Scope scope(scriptState);
 
   if (frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument())
     frame()->loader().didAccessInitialDocument();
 
   v8::Local<v8::Value> object = executeScriptAndReturnValue(
       scriptState->context(), sourceCode, accessControlStatus);
@@ skipping 37 matching lines @@
     for (size_t i = 0; i < resultArray->Length(); ++i) {
       v8::Local<v8::Value> value;
       if (!resultArray->Get(context, i).ToLocal(&value))
         return;
       results->push_back(value);
     }
   }
 }
 
 }  // namespace blink