Set the target type when creating the request for main resource

Source/core/loader/NavigationScheduler.cpp

Index: Source/core/loader/NavigationScheduler.cpp
diff --git a/Source/core/loader/NavigationScheduler.cpp b/Source/core/loader/NavigationScheduler.cpp
index 0b0afb0d1f32a8aed5e08bdc1d1ce0f809af4a89..a34f0c5db9c2fe9056dec7e96580b7ac4f56e48c 100644
--- a/Source/core/loader/NavigationScheduler.cpp
+++ b/Source/core/loader/NavigationScheduler.cpp
@@ -107,7 +107,9 @@ protected:
     virtual void fire(LocalFrame* frame) OVERRIDE
     {
         OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
-        FrameLoadRequest request(m_originDocument.get(), ResourceRequest(KURL(ParsedURLString, m_url), m_referrer), "_self");
+        ResourceRequest resourceRequest = ResourceRequest::createMainResourceRequest(
+            KURL(ParsedURLString, m_url), frame->isMainFrame(), m_referrer);
+        FrameLoadRequest request(m_originDocument.get(), resourceRequest, "_self");
         request.setLockBackForwardList(lockBackForwardList());
         request.setClientRedirect(ClientRedirect);
         frame->loader().load(request);
@@ -136,7 +138,9 @@ public:
     virtual void fire(LocalFrame* frame) OVERRIDE
     {
         OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
-        FrameLoadRequest request(originDocument(), ResourceRequest(KURL(ParsedURLString, url()), referrer()), "_self");
+        ResourceRequest resourceRequest = ResourceRequest::createMainResourceRequest(
+            KURL(ParsedURLString, url()), frame->isMainFrame(), referrer());
+        FrameLoadRequest request(originDocument(), resourceRequest, "_self");
         request.setLockBackForwardList(lockBackForwardList());
         if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.resourceRequest().url()))
             request.resourceRequest().setCachePolicy(ReloadIgnoringCacheData);
@@ -161,7 +165,9 @@ public:
     virtual void fire(LocalFrame* frame) OVERRIDE
     {
         OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
-        FrameLoadRequest request(originDocument(), ResourceRequest(KURL(ParsedURLString, url()), referrer(), ReloadIgnoringCacheData), "_self");
+        ResourceRequest resourceRequest = ResourceRequest::createMainResourceRequest(
+            KURL(ParsedURLString, url()), frame->isMainFrame(), referrer(), ReloadIgnoringCacheData);
+        FrameLoadRequest request(originDocument(), resourceRequest, "_self");
         request.setLockBackForwardList(lockBackForwardList());
         request.setClientRedirect(ClientRedirect);
         frame->loader().load(request);
@@ -181,7 +187,9 @@ public:
         OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
 
         if (!m_historySteps) {
-            FrameLoadRequest frameRequest(frame->document(), ResourceRequest(frame->document()->url()));
+            ResourceRequest resourceRequest = ResourceRequest::createMainResourceRequest(
+                frame->document()->url(), frame->isMainFrame());
+            FrameLoadRequest frameRequest(frame->document(), resourceRequest);
             frameRequest.setLockBackForwardList(lockBackForwardList());
             // Special case for go(0) from a frame -> reload only the frame
             // To follow Firefox and IE's behavior, history reload can only navigate the self frame.
@@ -209,7 +217,9 @@ public:
     virtual void fire(LocalFrame* frame) OVERRIDE
     {
         OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
-        FrameLoadRequest frameRequest(m_submission->state()->sourceDocument());
+        ResourceRequest resourceRequest = ResourceRequest::createMainResourceRequest(
+            blankURL(), frame->isMainFrame());
+        FrameLoadRequest frameRequest(m_submission->state()->sourceDocument(), resourceRequest);
         m_submission->populateFrameLoadRequest(frameRequest);
         frameRequest.setLockBackForwardList(lockBackForwardList());
         frameRequest.setTriggeringEvent(m_submission->event());
@@ -309,7 +319,9 @@ void NavigationScheduler::scheduleLocationChange(Document* originDocument, const
     if (originDocument->securityOrigin()->canAccess(m_frame->document()->securityOrigin())) {
         KURL parsedURL(ParsedURLString, url);
         if (parsedURL.hasFragmentIdentifier() && equalIgnoringFragmentIdentifier(m_frame->document()->url(), parsedURL)) {
-            FrameLoadRequest request(originDocument, ResourceRequest(m_frame->document()->completeURL(url), referrer), "_self");
+            ResourceRequest resourceRequest = ResourceRequest::createMainResourceRequest(
+                m_frame->document()->completeURL(url), m_frame->isMainFrame(), referrer);
+            FrameLoadRequest request(originDocument, resourceRequest, "_self");
             request.setLockBackForwardList(lockBackForwardList);
             if (lockBackForwardList)
                 request.setClientRedirect(ClientRedirect);