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

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

Issue 339593005: Set the target type when creating the request for main resource (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Made the setter method private Created 6 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: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 29975dca8bbe239e1c0e1a825e90c6c7234cbe67..f4d33eb43183adee8c76b55c45f3b8a5469af925 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -2729,9 +2729,7 @@ TEST_F(WebFrameTest, ReloadWhileProvisional)
FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize();
- WebURLRequest request;
- request.initialize();
- request.setURL(toKURL(m_baseURL + "fixed_layout.html"));
+ WebURLRequest request(toKURL(m_baseURL + "fixed_layout.html"), true, true);
webViewHelper.webView()->mainFrame()->loadRequest(request);
// start reload before first request is delivered.
FrameTestHelpers::reloadFrameIgnoringCache(webViewHelper.webView()->mainFrame());
@@ -4796,7 +4794,9 @@ TEST_F(WebFrameTest, SimulateFragmentAnchorMiddleClick)
RefPtrWillBeRawPtr<WebCore::Event> event = WebCore::MouseEvent::create(WebCore::EventTypeNames::click, false, false,
document->domWindow(), 0, 0, 0, 0, 0, 0, 0, false, false, false, false, 1, nullptr, nullptr);
- WebCore::FrameLoadRequest frameRequest(document, WebCore::ResourceRequest(destination));
+ WebCore::ResourceRequest resourceRequest = WebCore::ResourceRequest::createMainResourceRequest(
+ destination, true);
+ WebCore::FrameLoadRequest frameRequest(document, resourceRequest);
frameRequest.setTriggeringEvent(event);
toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->loader().load(frameRequest);
}
@@ -4846,7 +4846,9 @@ TEST_F(WebFrameTest, ModifiedClickNewWindow)
// ctrl+click event
RefPtrWillBeRawPtr<WebCore::Event> event = WebCore::MouseEvent::create(WebCore::EventTypeNames::click, false, false,
document->domWindow(), 0, 0, 0, 0, 0, 0, 0, true, false, false, false, 0, nullptr, nullptr);
- WebCore::FrameLoadRequest frameRequest(document, WebCore::ResourceRequest(destination));
+ WebCore::ResourceRequest resourceRequest = WebCore::ResourceRequest::createMainResourceRequest(
+ destination, true);
+ WebCore::FrameLoadRequest frameRequest(document, resourceRequest);
frameRequest.setTriggeringEvent(event);
WebCore::UserGestureIndicator gesture(WebCore::DefinitelyProcessingUserGesture);
toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->loader().load(frameRequest);
@@ -5056,7 +5058,9 @@ TEST_F(WebFrameTest, NavigateToSame)
webViewHelper.initializeAndLoad(m_baseURL + "navigate_to_same.html", true, &client);
EXPECT_FALSE(client.frameLoadTypeSameSeen());
- WebCore::FrameLoadRequest frameRequest(0, WebCore::ResourceRequest(toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document()->url()));
+ WebCore::ResourceRequest request = WebCore::ResourceRequest::createMainResourceRequest(
+ toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document()->url(), true);
+ WebCore::FrameLoadRequest frameRequest(0, request);
toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->loader().load(frameRequest);
FrameTestHelpers::pumpPendingRequestsDoNotUse(webViewHelper.webView()->mainFrame());
@@ -5273,9 +5277,7 @@ TEST_F(WebFrameTest, CurrentHistoryItem)
webViewHelper.initialize();
WebFrame* frame = webViewHelper.webView()->mainFrame();
const WebCore::FrameLoader& mainFrameLoader = webViewHelper.webViewImpl()->mainFrameImpl()->frame()->loader();
- WebURLRequest request;
- request.initialize();
- request.setURL(toKURL(url));
+ WebURLRequest request(toKURL(url), true);
frame->loadRequest(request);
// Before commit, there is no history item.

Powered by Google App Engine
This is Rietveld 408576698