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

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

 /*
  * Copyright (C) 2010 Google Inc. 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
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "public/web/WebFrame.h"
 
 #include <stdarg.h>
 
 #include <map>
 #include <memory>
 
 #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"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/css/resolver/ViewportStyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/NodeComputedStyle.h"
@@ skipping 963 matching lines @@
 }  // namespace
 
 TEST_P(ParameterizedWebFrameTest, PostMessageThenDetach) {
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad("about:blank");
 
   LocalFrame* frame =
       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);
   webViewHelper.reset();
   EXPECT_FALSE(exceptionState.hadException());
 
   // Success is not crashing.
   runPendingTasks();
 }
 
@@ skipping 7820 matching lines @@
   {
     v8::Local<v8::Value> exception = mainFrame()->executeScriptAndReturnValue(
         WebScriptSource("try {\n"
                         "  savedSetTimeout.call(window[0], () => {}, 0);\n"
                         "} catch (e) { e; }"));
     ASSERT_TRUE(!exception.IsEmpty());
     EXPECT_EQ(
         "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()));
   }
 
   reset();
 }
 
 TEST_F(WebFrameSwapTest, SwapInitializesGlobal) {
   v8::HandleScope scope(v8::Isolate::GetCurrent());
@@ skipping 2648 matching lines @@
   FrameTestHelpers::loadFrame(localFrame, "data:text/html,some page");
 
   // Local frame with remote parent should have transparent baseBackgroundColor.
   Color color = localFrame->frameView()->baseBackgroundColor();
   EXPECT_EQ(Color::transparent, color);
 
   view->close();
 }
 
 }  // namespace blink