Adding Embedding-CSP HTTP header

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

Index: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
index 9bfc1b0d6a358d2afddf45b71d395c386ecb7b62..fb86610fcb43fb6fadde40018102ca229f263730 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
@@ -184,7 +184,7 @@ protected:
         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());
@@ -202,14 +202,14 @@ protected:
         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));
         }
     }