| 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 745754593b26a80208319da5f50690af508331e4..5d5fd90b4f342599b8a6177371a35b366c933955 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -5489,8 +5489,7 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentBody)
|
|
|
| // Create another window that will try to access it.
|
| FrameTestHelpers::WebViewHelper newWebViewHelper(this);
|
| - WebView* newView = newWebViewHelper.initialize(true);
|
| - newView->mainFrame()->setOpener(webViewHelper.webView()->mainFrame());
|
| + WebView* newView = newWebViewHelper.initializeWithOpener(webViewHelper.webView()->mainFrame(), true);
|
| runPendingTasks();
|
| EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
|
|
|
| @@ -5521,8 +5520,7 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentNavigator)
|
|
|
| // Create another window that will try to access it.
|
| FrameTestHelpers::WebViewHelper newWebViewHelper(this);
|
| - WebView* newView = newWebViewHelper.initialize(true);
|
| - newView->mainFrame()->setOpener(webViewHelper.webView()->mainFrame());
|
| + WebView* newView = newWebViewHelper.initializeWithOpener(webViewHelper.webView()->mainFrame(), true);
|
| runPendingTasks();
|
| EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
|
|
|
| @@ -5565,8 +5563,7 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentBodyBeforeModalDialog)
|
|
|
| // Create another window that will try to access it.
|
| FrameTestHelpers::WebViewHelper newWebViewHelper(this);
|
| - WebView* newView = newWebViewHelper.initialize(true);
|
| - newView->mainFrame()->setOpener(webViewHelper.webView()->mainFrame());
|
| + WebView* newView = newWebViewHelper.initializeWithOpener(webViewHelper.webView()->mainFrame(), true);
|
| runPendingTasks();
|
| EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
|
|
|
| @@ -5605,8 +5602,7 @@ TEST_P(ParameterizedWebFrameTest, DidWriteToInitialDocumentBeforeModalDialog)
|
|
|
| // Create another window that will try to access it.
|
| FrameTestHelpers::WebViewHelper newWebViewHelper(this);
|
| - WebView* newView = newWebViewHelper.initialize(true);
|
| - newView->mainFrame()->setOpener(webViewHelper.webView()->mainFrame());
|
| + WebView* newView = newWebViewHelper.initializeWithOpener(webViewHelper.webView()->mainFrame(), true);
|
| runPendingTasks();
|
| EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
|
|
|
| @@ -7215,7 +7211,7 @@ TEST_F(WebFrameSwapTest, SwapParentShouldDetachChildren)
|
|
|
| // Create child frames in the target frame before testing the swap.
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteFrameClient2;
|
| - WebRemoteFrame* childRemoteFrame = remoteFrame->createRemoteChild(WebTreeScopeType::Document, "", "uniqueName0", WebSandboxFlags::None, &remoteFrameClient2);
|
| + WebRemoteFrame* childRemoteFrame = FrameTestHelpers::createRemoteChild(remoteFrame, &remoteFrameClient2);
|
|
|
| FrameTestHelpers::TestWebFrameClient client;
|
| WebLocalFrame* localFrame = WebLocalFrame::createProvisional(&client, remoteFrame, WebSandboxFlags::None, WebFrameOwnerProperties());
|
| @@ -7798,7 +7794,7 @@ TEST_P(ParameterizedWebFrameTest, DetachRemoteFrame)
|
| WebView* view = WebView::create(&viewClient);
|
| view->setMainFrame(remoteClient.frame());
|
| FrameTestHelpers::TestWebRemoteFrameClient childFrameClient;
|
| - WebRemoteFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createRemoteChild(WebTreeScopeType::Document, "", "uniqueName1", WebSandboxFlags::None, &childFrameClient);
|
| + WebRemoteFrame* childFrame = FrameTestHelpers::createRemoteChild(view->mainFrame()->toWebRemoteFrame(), &childFrameClient);
|
| childFrame->detach();
|
| view->close();
|
| childFrame->close();
|
|
|