Correctly send the 'HTTPS' header for top-level navigations.

Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, 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 114 matching lines @@
 
         { "https://example.test/image.png", "https://example.test/image.png" },
         { "https://example.test:80/image.png", "https://example.test:80/image.png" },
         { "https://example.test:1212/image.png", "https://example.test:1212/image.png" },
 
         { "ftp://example.test/image.png", "ftp://example.test/image.png" },
         { "ftp://example.test:21/image.png", "ftp://example.test:21/image.png" },
         { "ftp://example.test:1212/image.png", "ftp://example.test:1212/image.png" },
     };
 
+    FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
     document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsUpgrade);
 
-    for (auto test : tests) {
+    for (const auto& test : tests) {
         document->insecureNavigationsToUpgrade()->clear();
 
         // We always upgrade for FrameTypeNone and FrameTypeNested.
         expectUpgrade(test.original, WebURLRequest::RequestContextScript, WebURLRequest::FrameTypeNone, test.upgraded);
         expectUpgrade(test.original, WebURLRequest::RequestContextScript, WebURLRequest::FrameTypeNested, test.upgraded);
 
         // We do not upgrade for FrameTypeTopLevel or FrameTypeAuxiliary...
         expectUpgrade(test.original, WebURLRequest::RequestContextScript, WebURLRequest::FrameTypeTopLevel, test.original);
         expectUpgrade(test.original, WebURLRequest::RequestContextScript, WebURLRequest::FrameTypeAuxiliary, test.original);
 
         // unless the request context is RequestContextForm.
         expectUpgrade(test.original, WebURLRequest::RequestContextForm, WebURLRequest::FrameTypeTopLevel, test.upgraded);
         expectUpgrade(test.original, WebURLRequest::RequestContextForm, WebURLRequest::FrameTypeAuxiliary, test.upgraded);
 
         // Or unless the host of the resource is in the document's InsecureNavigationsSet:
         document->addInsecureNavigationUpgrade(exampleOrigin->host().impl()->hash());
         expectUpgrade(test.original, WebURLRequest::RequestContextScript, WebURLRequest::FrameTypeTopLevel, test.upgraded);
         expectUpgrade(test.original, WebURLRequest::RequestContextScript, WebURLRequest::FrameTypeAuxiliary, test.upgraded);
     }
 }
 
 TEST_F(FrameFetchContextUpgradeTest, DoNotUpgradeInsecureResourceRequests)
 {
+    FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
     document->setSecurityOrigin(secureOrigin);
     document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsDoNotUpgrade);
 
     expectUpgrade("http://example.test/image.png", "http://example.test/image.png");
     expectUpgrade("http://example.test:80/image.png", "http://example.test:80/image.png");
     expectUpgrade("http://example.test:1212/image.png", "http://example.test:1212/image.png");
 
     expectUpgrade("https://example.test/image.png", "https://example.test/image.png");
     expectUpgrade("https://example.test:80/image.png", "https://example.test:80/image.png");
     expectUpgrade("https://example.test:1212/image.png", "https://example.test:1212/image.png");
 
     expectUpgrade("ftp://example.test/image.png", "ftp://example.test/image.png");
     expectUpgrade("ftp://example.test:21/image.png", "ftp://example.test:21/image.png");
     expectUpgrade("ftp://example.test:1212/image.png", "ftp://example.test:1212/image.png");
 }
 
-TEST_F(FrameFetchContextUpgradeTest, SendPreferHeader)
+TEST_F(FrameFetchContextUpgradeTest, SendHTTPSHeader)
 {
     struct TestCase {
         const char* toRequest;
         WebURLRequest::FrameType frameType;
         bool shouldPrefer;
     } tests[] = {
         { "http://example.test/page.html", WebURLRequest::FrameTypeAuxiliary, true },
         { "http://example.test/page.html", WebURLRequest::FrameTypeNested, true },
         { "http://example.test/page.html", WebURLRequest::FrameTypeNone, false },
         { "http://example.test/page.html", WebURLRequest::FrameTypeTopLevel, true },
         { "https://example.test/page.html", WebURLRequest::FrameTypeAuxiliary, true },
         { "https://example.test/page.html", WebURLRequest::FrameTypeNested, true },
         { "https://example.test/page.html", WebURLRequest::FrameTypeNone, false },
         { "https://example.test/page.html", WebURLRequest::FrameTypeTopLevel, true }
     };
 
-    for (auto test : tests) {
+    // This should work correctly both when the FrameFetchContext has a Document, and
+    // when it doesn't (e.g. during main frame navigations), so run through the tests
+    // both before and after providing a document to the context.
+    for (const auto& test : tests) {
         document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsDoNotUpgrade);
         expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
 
+        document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsUpgrade);
+        expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
+    }
+
+    FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
+
+    for (const auto& test : tests) {
+        document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsDoNotUpgrade);
+        expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
+
         document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsUpgrade);
         expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
     }
 }
 
 class FrameFetchContextHintsTest : public ::testing::Test {
 public:
     FrameFetchContextHintsTest() { }
 
 protected:
@@ skipping 65 matching lines @@
     ClientHintsPreferences preferences;
     preferences.setShouldSendDPR(true);
     preferences.setShouldSendRW(true);
     document->setClientHintsPreferences(preferences);
     expectHeader("http://www.example.com/1.gif", "DPR", true, "1");
     expectHeader("http://www.example.com/1.gif", "RW", true, "500");
 }
 
 } // namespace