Upgrade-Insecure-Requests: Split CSP checks into pre-upgrade and post-upgrade.

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
index 4dd20215f9464f89778892f0394d1c22daa38a33..9966ed5917eccb90d2e4e80a841e35f20a9368f0 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
@@ -308,10 +308,14 @@ void ServiceWorkerContainer::registerServiceWorkerImpl(
   ContentSecurityPolicy* csp = executionContext->contentSecurityPolicy();
   if (csp) {
     if (!(csp->allowRequestWithoutIntegrity(
-              WebURLRequest::RequestContextServiceWorker, scriptURL) &&
+              WebURLRequest::RequestContextServiceWorker, scriptURL,
+              ResourceRequest::RedirectStatus::NoRedirect,
+              ContentSecurityPolicy::SendReport,
+              ContentSecurityPolicyHeaderTypeEnforce) &&
           csp->allowWorkerContextFromSource(
               scriptURL, ResourceRequest::RedirectStatus::NoRedirect,
-              ContentSecurityPolicy::SendReport))) {
+              ContentSecurityPolicy::SendReport,
+              ContentSecurityPolicyHeaderTypeEnforce))) {
       callbacks->onError(WebServiceWorkerError(
           WebServiceWorkerError::ErrorTypeSecurity,
           String(