Upgrade insecure requests: Pipe navigational hosts down into nested documents.

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 117 matching lines @@
         { "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" },
     };
 
     document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsUpgrade);
 
     for (auto test : tests) {
-        // secureOrigin's host is 'secureorigin.test', not 'example.test'
-        document->setSecurityOrigin(secureOrigin);
+        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 document matches the host of the resource:
-        document->setSecurityOrigin(exampleOrigin);
+        // 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)
 {
     document->setSecurityOrigin(secureOrigin);
     document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsDoNotUpgrade);
 
@@ skipping 96 matching lines @@
     expectHeader("http://www.example.com/1.gif", "RW", false, "");
 
     dummyPageHolder->frame().setShouldSendDPRHint();
     dummyPageHolder->frame().setShouldSendRWHint();
     expectHeader("http://www.example.com/1.gif", "DPR", true, "1");
     expectHeader("http://www.example.com/1.gif", "RW", true, "500");
 }
 
 } // namespace