Revert of Move 'frame-src' CSP checks into FrameFetchContext.

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 3350 matching lines @@
     ASSERT_TRUE(iframe);
     WebDataSource* iframeDataSource = iframe->dataSource();
     ASSERT_TRUE(iframeDataSource);
     WebVector<WebURL> redirects;
     iframeDataSource->redirectChain(redirects);
     ASSERT_EQ(2U, redirects.size());
     EXPECT_EQ(toKURL("about:blank"), KURL(redirects[0]));
     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");
     registerMockedHttpURLLoad("autofocus_input_field_iframe.html");
 
     FrameTestHelpers::WebViewHelper webViewHelper(this);
     webViewHelper.initializeAndLoad(m_baseURL + "iframe_clear_focused_node_test.html", true);
 
     // Clear the focused node.
     webViewHelper.webView()->clearFocusedElement();
@@ skipping 5257 matching lines @@
     WebLocalFrame* mainFrame = helper.webView()->mainFrame()->toWebLocalFrame();
     v8::HandleScope scope(v8::Isolate::GetCurrent());
     mainFrame->executeScript(WebScriptSource("hello = 'world';"));
     FrameTestHelpers::loadFrame(mainFrame, "data:text/html,new page");
     v8::Local<v8::Value> result = mainFrame->executeScriptAndReturnValue(WebScriptSource("hello"));
     ASSERT_TRUE(result->IsString());
     EXPECT_EQ("world", toCoreString(result->ToString(mainFrame->mainWorldScriptContext()).ToLocalChecked()));
 }
 
 } // namespace blink