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

third_party/WebKit/Source/core/workers/AbstractWorker.cpp

Index: third_party/WebKit/Source/core/workers/AbstractWorker.cpp
diff --git a/third_party/WebKit/Source/core/workers/AbstractWorker.cpp b/third_party/WebKit/Source/core/workers/AbstractWorker.cpp
index 5a0f70aa4434eb23b516c1d1df90ac5975eaac59..3c66c6359dd7d391239a466287201a2ff9cd278e 100644
--- a/third_party/WebKit/Source/core/workers/AbstractWorker.cpp
+++ b/third_party/WebKit/Source/core/workers/AbstractWorker.cpp
@@ -69,10 +69,17 @@ KURL AbstractWorker::resolveURL(const String& url,
   if (getExecutionContext()->contentSecurityPolicy() &&
       !(getExecutionContext()
             ->contentSecurityPolicy()
-            ->allowRequestWithoutIntegrity(requestContext, scriptURL) &&
+            ->allowRequestWithoutIntegrity(
+                requestContext, scriptURL,
+                ResourceRequest::RedirectStatus::NoRedirect,
+                ContentSecurityPolicy::SendReport,
+                ContentSecurityPolicyHeaderTypeEnforce) &&
         getExecutionContext()
             ->contentSecurityPolicy()
-            ->allowWorkerContextFromSource(scriptURL))) {
+            ->allowWorkerContextFromSource(
+                scriptURL, ResourceRequest::RedirectStatus::NoRedirect,
+                ContentSecurityPolicy::SendReport,
+                ContentSecurityPolicyHeaderTypeEnforce))) {
     exceptionState.throwSecurityError(
         "Access to the script at '" + scriptURL.elidedString() +
         "' is denied by the document's Content Security Policy.");