Set the target type when creating the request for main resource

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 2711 matching lines @@
 }
 
 TEST_F(WebFrameTest, ReloadWhileProvisional)
 {
     // Test that reloading while the previous load is still pending does not cause the initial
     // request to get lost.
     registerMockedHttpURLLoad("fixed_layout.html");
 
     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());
 
     WebDataSource* dataSource = webViewHelper.webView()->mainFrame()->dataSource();
     ASSERT_TRUE(dataSource);
     EXPECT_EQ(toKURL(m_baseURL + "fixed_layout.html"), toKURL(dataSource->request().url().spec()));
 }
 
 TEST_F(WebFrameTest, AppendRedirects)
@@ skipping 2044 matching lines @@
     TestNavigationPolicyWebFrameClient client;
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html", true, &client);
 
     WebCore::Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();
     WebCore::KURL destination = document->url();
     destination.setFragmentIdentifier("test");
 
     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);
 }
 
 class TestNewWindowWebViewClient : public FrameTestHelpers::TestWebViewClient {
 public:
     virtual WebView* createView(WebLocalFrame*, const WebURLRequest&, const WebWindowFeatures&,
         const WebString&, WebNavigationPolicy, bool) OVERRIDE
     {
         EXPECT_TRUE(false);
@@ skipping 29 matching lines @@
     TestNewWindowWebFrameClient webFrameClient;
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "ctrl_click.html", true, &webFrameClient, &webViewClient);
 
     WebCore::Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();
     WebCore::KURL destination = toKURL(m_baseURL + "hello_world.html");
 
     // 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);
     FrameTestHelpers::pumpPendingRequestsDoNotUse(webViewHelper.webView()->mainFrame());
 
     // decidePolicyForNavigation should be called both for the original request and the ctrl+click.
     EXPECT_EQ(2, webFrameClient.decidePolicyCallCount());
 }
 
 TEST_F(WebFrameTest, BackToReload)
@@ skipping 189 matching lines @@
 };
 
 TEST_F(WebFrameTest, NavigateToSame)
 {
     registerMockedHttpURLLoad("navigate_to_same.html");
     TestSameDocumentWebFrameClient client;
     FrameTestHelpers::WebViewHelper webViewHelper;
     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());
 
     EXPECT_TRUE(client.frameLoadTypeSameSeen());
 }
 
 TEST_F(WebFrameTest, WebNodeImageContents)
 {
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad("about:blank", true);
@@ skipping 196 matching lines @@
 // Test that currentHistoryItem reflects the current page, not the provisional load.
 TEST_F(WebFrameTest, CurrentHistoryItem)
 {
     registerMockedHttpURLLoad("fixed_layout.html");
     std::string url = m_baseURL + "fixed_layout.html";
 
     FrameTestHelpers::WebViewHelper webViewHelper;
     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.
     EXPECT_FALSE(mainFrameLoader.currentItem());
 
     FrameTestHelpers::pumpPendingRequestsDoNotUse(frame);
 
     // After commit, there is.
     WebCore::HistoryItem* item = mainFrameLoader.currentItem();
     ASSERT_TRUE(item);
@@ skipping 318 matching lines @@
     EXPECT_EQ(0xff0000ff, frame->document().brandColor());
     // Change of second brand-color meta tag will not change frame's brand
     // color.
     client.reset();
     frame->executeScript(WebScriptSource("document.getElementById('bc2').setAttribute('content', '#00FF00');"));
     EXPECT_TRUE(client.didNotify());
     EXPECT_EQ(0xff0000ff, frame->document().brandColor());
 }
 
 } // namespace