Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy.

third_party/WebKit/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 26 matching lines @@
 #include "core/frame/Settings.h"
 #include "core/html/HTMLDocument.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/EmptyClients.h"
 #include "core/page/Page.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/WebAddressSpace.h"
 #include "public/platform/WebCachePolicy.h"
+#include "public/platform/WebInsecureRequestPolicy.h"
 #include "testing/gmock/include/gmock/gmock-generated-function-mockers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 class StubFrameLoaderClientWithParent final : public EmptyFrameLoaderClient {
 public:
     static StubFrameLoaderClientWithParent* create(Frame* parent)
     {
         return new StubFrameLoaderClientWithParent(parent);
@@ skipping 167 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);
+    document->setInsecureRequestPolicy(kUpgradeInsecureRequests);
 
     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);
+    document->setInsecureRequestPolicy(kLeaveInsecureRequestsAlone);
 
     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");
@@ skipping 15 matching lines @@
         { "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 }
     };
 
     // 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);
+        document->setInsecureRequestPolicy(kLeaveInsecureRequestsAlone);
         expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
 
-        document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsUpgrade);
+        document->setInsecureRequestPolicy(kUpgradeInsecureRequests);
         expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
     }
 
     FrameFetchContext::provideDocumentToContext(*fetchContext, document.get());
 
     for (const auto& test : tests) {
-        document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsDoNotUpgrade);
+        document->setInsecureRequestPolicy(kLeaveInsecureRequestsAlone);
         expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
 
-        document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsUpgrade);
+        document->setInsecureRequestPolicy(kUpgradeInsecureRequests);
         expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
     }
 }
 
 class FrameFetchContextHintsTest : public FrameFetchContextTest {
 public:
     FrameFetchContextHintsTest() { }
 
 protected:
     void expectHeader(const char* input, const char* headerName, bool isPresent, const char* headerValue, float width = 0)
@@ skipping 305 matching lines @@
         fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
         EXPECT_EQ(mainRequest.isExternalRequest(), test.isExternalExpectation);
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
         EXPECT_EQ(subRequest.isExternalRequest(), test.isExternalExpectation);
     }
 }
 
 } // namespace blink