[WIP] Upgrade-insecure-request: upgrade insecurely-redirected requests.

third_party/WebKit/Source/core/loader/FrameLoader.cpp

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 31ba8fcda1a9563cc97b6c25481c9a418c77b573..546af8824312c76db7105dde3f255930ee4572d7 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -1632,10 +1632,6 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest,
                              : WebURLRequest::FrameTypeNested);
   ResourceRequest& request = frameLoadRequest.resourceRequest();
 
-  // Record the latest requiredCSP value that will be used when sending this
-  // request.
-  recordLatestRequiredCSP();
-  modifyRequestForCSP(request, nullptr);
   if (!shouldContinueForNavigationPolicy(
           request, frameLoadRequest.substituteData(), nullptr,
           frameLoadRequest.shouldCheckMainWorldContentSecurityPolicy(),
@@ -1646,6 +1642,11 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest,
           frameLoadRequest.form()))
     return;
 
+  // Record the latest requiredCSP value that will be used when sending this
+  // request.
+  recordLatestRequiredCSP();
+  modifyRequestForCSP(request, nullptr);
+
   m_frame->document()->cancelParsing();
   detachDocumentLoader(m_provisionalDocumentLoader);
 
@@ -1884,6 +1885,8 @@ void FrameLoader::upgradeInsecureRequest(ResourceRequest& resourceRequest,
       document ? document->insecureNavigationsToUpgrade()
                : insecureNavigationsToUpgrade();
 
+  resourceRequest.setInsecurePolicy(relevantPolicy);
+
   if (url.protocolIs("http") && relevantPolicy & kUpgradeInsecureRequests) {
     // We always upgrade requests that meet any of the following criteria:
     //