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

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

 /*
  * Copyright (C) 2013 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 290 matching lines @@
     callbacks->onError(WebServiceWorkerError(
         WebServiceWorkerError::ErrorTypeType,
         WebString::fromUTF8("Failed to register a ServiceWorker: " +
                             webErrorMessage.utf8())));
     return;
   }
 
   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(
               "Failed to register a ServiceWorker: The provided scriptURL ('" +
               scriptURL.getString() +
               "') violates the Content Security Policy.")));
       return;
     }
   }
 
@@ skipping 206 matching lines @@
 
   if (ServiceWorkerContainerClient* client =
           ServiceWorkerContainerClient::from(executionContext)) {
     m_provider = client->provider();
     if (m_provider)
       m_provider->setClient(this);
   }
 }
 
 }  // namespace blink