Adding Embedding-CSP HTTP header

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 166 matching lines @@
 
     void expectUpgrade(const char* input, WebURLRequest::RequestContext requestContext, WebURLRequest::FrameType frameType, const char* expected)
     {
         KURL inputURL(ParsedURLString, input);
         KURL expectedURL(ParsedURLString, expected);
 
         FetchRequest fetchRequest = FetchRequest(ResourceRequest(inputURL), FetchInitiatorInfo());
         fetchRequest.mutableResourceRequest().setRequestContext(requestContext);
         fetchRequest.mutableResourceRequest().setFrameType(frameType);
 
-        fetchContext->upgradeInsecureRequest(fetchRequest.mutableResourceRequest());
+        fetchContext->addOutgoingSecurityHeadersAndUpgradeRequest(fetchRequest.mutableResourceRequest());

[Mike West, 2016/10/06 08:00:51]

Please add tests in this file for the header you're adding. You could do it in
the same class (possibly renaming it to something like
`FrameFetchContextModifyRequestTest` if you accept the naming suggestion in the
other comment), just adding something like
`TEST_F(FrameFetchContextModifyRequestTest, SendExpectedCSPHeader)`, similar to
`SendHTTPSHeader`.

 
         EXPECT_EQ(expectedURL.getString(), fetchRequest.resourceRequest().url().getString());
         EXPECT_EQ(expectedURL.protocol(), fetchRequest.resourceRequest().url().protocol());
         EXPECT_EQ(expectedURL.host(), fetchRequest.resourceRequest().url().host());
         EXPECT_EQ(expectedURL.port(), fetchRequest.resourceRequest().url().port());
         EXPECT_EQ(expectedURL.hasPort(), fetchRequest.resourceRequest().url().hasPort());
         EXPECT_EQ(expectedURL.path(), fetchRequest.resourceRequest().url().path());
     }
 
     void expectHTTPSHeader(const char* input, WebURLRequest::FrameType frameType, bool shouldPrefer)

[Mike West, 2016/10/06 08:00:51]

Nit: While you're here, could you rename this to
`expectUpgradeInsecureRequestHeader`, and the associated test to
`SendUpgradeInsecureRequestHeader`? Doing that in a separate patch would be
fine, if you don't want to clutter this diff.

     {
         KURL inputURL(ParsedURLString, input);
 
         FetchRequest fetchRequest = FetchRequest(ResourceRequest(inputURL), FetchInitiatorInfo());
         fetchRequest.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextScript);
         fetchRequest.mutableResourceRequest().setFrameType(frameType);
 
-        fetchContext->upgradeInsecureRequest(fetchRequest.mutableResourceRequest());
+        fetchContext->addOutgoingSecurityHeadersAndUpgradeRequest(fetchRequest.mutableResourceRequest());
 
         EXPECT_EQ(shouldPrefer ? String("1") : String(),
             fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests));
 
         // Calling upgradeInsecureRequest more than once shouldn't affect the header.
         if (shouldPrefer) {
-            fetchContext->upgradeInsecureRequest(fetchRequest.mutableResourceRequest());
+            fetchContext->addOutgoingSecurityHeadersAndUpgradeRequest(fetchRequest.mutableResourceRequest());
             EXPECT_EQ("1", fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests));
         }
     }
 
     RefPtr<SecurityOrigin> exampleOrigin;
     RefPtr<SecurityOrigin> secureOrigin;
 };
 
 TEST_F(FrameFetchContextUpgradeTest, UpgradeInsecureResourceRequests)
 {
@@ skipping 464 matching lines @@
         fetchContext->addAdditionalRequestHeaders(mainRequest, FetchMainResource);
         EXPECT_EQ(test.isExternalExpectation, mainRequest.isExternalRequest());
 
         ResourceRequest subRequest(test.url);
         fetchContext->addAdditionalRequestHeaders(subRequest, FetchSubresource);
         EXPECT_EQ(test.isExternalExpectation, subRequest.isExternalRequest());
     }
 }
 
 } // namespace blink