Split CSP into pre- and post-upgrade checks

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 228 matching lines @@
     callbacks->OnError(WebServiceWorkerError(
         WebServiceWorkerError::kErrorTypeType,
         WebString::FromUTF8("Failed to register a ServiceWorker: " +
                             web_error_message.Utf8())));
     return;
   }
 
   ContentSecurityPolicy* csp = execution_context->GetContentSecurityPolicy();
   if (csp) {
     if (!(csp->AllowRequestWithoutIntegrity(
-              WebURLRequest::kRequestContextServiceWorker, script_url) &&
+              WebURLRequest::kRequestContextServiceWorker, script_url,
+              ResourceRequest::RedirectStatus::kNoRedirect,
+              SecurityViolationReportingPolicy::kReport,
+              kContentSecurityPolicyHeaderTypeEnforce) &&
           csp->AllowWorkerContextFromSource(
               script_url, ResourceRequest::RedirectStatus::kNoRedirect,
-              SecurityViolationReportingPolicy::kReport))) {
+              SecurityViolationReportingPolicy::kReport,
+              kContentSecurityPolicyHeaderTypeEnforce))) {
       callbacks->OnError(WebServiceWorkerError(
           WebServiceWorkerError::kErrorTypeSecurity,
           String(
               "Failed to register a ServiceWorker: The provided scriptURL ('" +
               script_url.GetString() +
               "') violates the Content Security Policy.")));
       return;
     }
   }
 
@@ skipping 223 matching lines @@
 
   if (ServiceWorkerContainerClient* client =
           ServiceWorkerContainerClient::From(execution_context)) {
     provider_ = client->Provider();
     if (provider_)
       provider_->SetClient(this);
   }
 }
 
 }  // namespace blink