Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 2068443002: Revert of Move 'frame-src' CSP checks into FrameFetchContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run revert on local machine to resolve conflicts Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0651c10139c5e73148a425565337cce38caaf789..4b6d25479e55330bf4a7ecbdafc01ca2683bb686 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -3368,31 +3368,6 @@ TEST_P(ParameterizedWebFrameTest, IframeRedirect)
EXPECT_EQ(toKURL("http://internal.test/visible_iframe.html"), KURL(redirects[1]));
}
-TEST_P(ParameterizedWebFrameTest, IframeRedirectBlocked)
-{
- registerMockedHttpURLLoad("iframe_redirect_blocked.html");
- registerMockedHttpURLLoad("visible_iframe.html");
-
- FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "iframe_redirect_blocked.html", true);
- // Pump pending requests one more time. The test page loads script that navigates
- // to a resource which is blocked.
- FrameTestHelpers::pumpPendingRequestsForFrameToLoad(webViewHelper.webView()->mainFrame());
- FrameTestHelpers::pumpPendingRequestsForFrameToLoad(webViewHelper.webView()->mainFrame());
-
- WebFrame* iframe = webViewHelper.webView()->findFrameByName(WebString::fromUTF8("ifr"));
- FrameTestHelpers::pumpPendingRequestsForFrameToLoad(iframe);
- ASSERT_TRUE(iframe);
- WebDataSource* iframeDataSource = iframe->dataSource();
- ASSERT_TRUE(iframeDataSource);
- WebVector<WebURL> redirects;
- iframeDataSource->redirectChain(redirects);
- ASSERT_EQ(3U, redirects.size());
- EXPECT_EQ(toKURL("about:blank"), KURL(redirects[0]));
- EXPECT_EQ(toKURL("http://internal.test/visible_iframe.html"), KURL(redirects[1]));
- EXPECT_EQ(toKURL("data:,"), KURL(redirects[2]));
-}
-
TEST_P(ParameterizedWebFrameTest, ClearFocusedNodeTest)
{
registerMockedHttpURLLoad("iframe_clear_focused_node_test.html");

Powered by Google App Engine
This is Rietveld 408576698