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

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index d936487d2f1f6807e164e89c71e22cc8f3a1ffd8..578b7a8191573301f85af07965d654390dcbd7ab 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -38,6 +38,7 @@
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
+#include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8Node.h"
 #include "bindings/core/v8/serialization/V8ScriptValueSerializer.h"
 #include "core/clipboard/DataTransfer.h"
@@ -1021,7 +1022,7 @@ TEST_P(ParameterizedWebFrameTest, PostMessageThenDetach) {
       toLocalFrame(webViewHelper.webView()->page()->mainFrame());
   NonThrowableExceptionState exceptionState;
   RefPtr<SerializedScriptValue> message =
-      serializeString("message", ScriptState::forMainWorld(frame));
+      serializeString("message", toScriptStateForMainWorld(frame));
   MessagePortArray messagePorts;
   frame->domWindow()->postMessage(message, messagePorts, "*",
                                   frame->domWindow(), exceptionState);
@@ -8862,7 +8863,7 @@ TEST_F(WebFrameSwapTest, SetTimeoutAfterSwap) {
         "SecurityError: Blocked a frame with origin \"http://internal.test\" "
         "from accessing a cross-origin frame.",
         toCoreString(exception
-                         ->ToString(ScriptState::forMainWorld(
+                         ->ToString(toScriptStateForMainWorld(
                                         webView()->mainFrameImpl()->frame())
                                         ->context())
                          .ToLocalChecked()));