| 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 b2d4ad274c57325a801197399a9ac6e4980b9bcb..ae1940e0bd41b672bd55c440334cf3859276e1f5 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -1595,7 +1595,7 @@ TEST_F(WebFrameTest, FrameOwnerPropertiesMargin)
|
| {
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| view->settings()->setJavaScriptEnabled(true);
|
| view->setMainFrame(remoteClient.frame());
|
| WebRemoteFrame* root = view->mainFrame()->toWebRemoteFrame();
|
| @@ -1627,7 +1627,7 @@ TEST_F(WebFrameTest, FrameOwnerPropertiesScrolling)
|
| {
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| view->settings()->setJavaScriptEnabled(true);
|
| view->setMainFrame(remoteClient.frame());
|
| WebRemoteFrame* root = view->mainFrame()->toWebRemoteFrame();
|
| @@ -7097,7 +7097,7 @@ TEST_P(ParameterizedWebFrameTest, EmbedderTriggeredDetachWithRemoteMainFrame)
|
| // write tests with a top-level remote frame.
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| view->setMainFrame(remoteClient.frame());
|
| WebLocalFrame* childFrame = FrameTestHelpers::createLocalChild(view->mainFrame()->toWebRemoteFrame());
|
|
|
| @@ -7743,7 +7743,7 @@ TEST_F(WebFrameTest, WindowOpenRemoteClose)
|
| FrameTestHelpers::TestWebRemoteFrameClient frameClient;
|
| WebRemoteFrameImpl* webRemoteFrame = frameClient.frame();
|
|
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| view->setMainFrame(webRemoteFrame);
|
| view->mainFrame()->setOpener(mainWebView.webView()->mainFrame());
|
| webRemoteFrame->setReplicatedOrigin(WebSecurityOrigin::createFromString("http://127.0.0.1"));
|
| @@ -7772,7 +7772,7 @@ TEST_F(WebFrameTest, NavigateRemoteToLocalWithOpener)
|
|
|
| // Create a popup with a remote frame and set its opener to the main frame.
|
| FrameTestHelpers::TestWebViewClient popupViewClient;
|
| - WebView* popupView = WebView::create(&popupViewClient);
|
| + WebView* popupView = WebView::create(&popupViewClient, true);
|
| FrameTestHelpers::TestWebRemoteFrameClient popupRemoteClient;
|
| WebRemoteFrame* popupRemoteFrame = popupRemoteClient.frame();
|
| popupView->setMainFrame(popupRemoteFrame);
|
| @@ -7796,7 +7796,7 @@ TEST_F(WebFrameTest, SwapWithOpenerCycle)
|
| {
|
| // First, create a remote main frame with itself as the opener.
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| WebRemoteFrame* remoteFrame = remoteClient.frame();
|
| view->setMainFrame(remoteFrame);
|
| @@ -7835,7 +7835,7 @@ TEST_P(ParameterizedWebFrameTest, RemoteFrameInitialCommitType)
|
| {
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| view->setMainFrame(remoteClient.frame());
|
| remoteClient.frame()->setReplicatedOrigin(WebSecurityOrigin::createFromString(WebString::fromUTF8(m_baseURL)));
|
|
|
| @@ -7861,7 +7861,7 @@ private:
|
| TEST_P(ParameterizedWebFrameTest, FrameWidgetTest)
|
| {
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
|
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| view->setMainFrame(remoteClient.frame());
|
| @@ -7931,7 +7931,7 @@ TEST_P(ParameterizedWebFrameTest, DetachRemoteFrame)
|
| {
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| view->setMainFrame(remoteClient.frame());
|
| FrameTestHelpers::TestWebRemoteFrameClient childFrameClient;
|
| WebRemoteFrame* childFrame = FrameTestHelpers::createRemoteChild(view->mainFrame()->toWebRemoteFrame(), &childFrameClient);
|
| @@ -8056,7 +8056,7 @@ TEST_P(ParameterizedWebFrameTest, CreateLocalChildWithPreviousSibling)
|
| {
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| view->setMainFrame(remoteClient.frame());
|
| WebRemoteFrame* parent = view->mainFrame()->toWebRemoteFrame();
|
|
|
| @@ -8091,7 +8091,7 @@ TEST_P(ParameterizedWebFrameTest, SendBeaconFromChildWithRemoteMainFrame)
|
| {
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| view->settings()->setJavaScriptEnabled(true);
|
| view->setMainFrame(remoteClient.frame());
|
| WebRemoteFrame* root = view->mainFrame()->toWebRemoteFrame();
|
| @@ -8113,7 +8113,7 @@ TEST_P(ParameterizedWebFrameTest, RemoteToLocalSwapOnMainFrameInitializesCoreFra
|
| {
|
| FrameTestHelpers::TestWebViewClient viewClient;
|
| FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
|
| - WebView* view = WebView::create(&viewClient);
|
| + WebView* view = WebView::create(&viewClient, true);
|
| view->setMainFrame(remoteClient.frame());
|
| WebRemoteFrame* remoteRoot = view->mainFrame()->toWebRemoteFrame();
|
| remoteRoot->setReplicatedOrigin(SecurityOrigin::createUnique());
|
|
|