Split CSP into pre- and post-upgrade checks

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
index fc5b53259a3164e4816724e4d8862c0658abdb88..88b9c419949613241d752782357866e37fd2da0d 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
@@ -500,9 +500,15 @@ ResourceFetcher::PrepareRequestResult ResourceFetcher::PrepareRequest(
          factory.GetType() == Resource::kRaw ||
          factory.GetType() == Resource::kXSLStyleSheet);
 
+  SecurityViolationReportingPolicy reporting_policy =
+      request.IsSpeculativePreload()
+          ? SecurityViolationReportingPolicy::kSuppressReporting
+          : SecurityViolationReportingPolicy::kReport;
   Context().PopulateResourceRequest(
+      MemoryCache::RemoveFragmentIdentifierIfNeeded(request.Url()),
       factory.GetType(), request.GetClientHintsPreferences(),
-      request.GetResourceWidth(), resource_request);
+      request.GetResourceWidth(), request.Options(), reporting_policy,
+      resource_request);
 
   if (!request.Url().IsValid())
     return kAbort;
@@ -521,10 +527,7 @@ ResourceFetcher::PrepareRequestResult ResourceFetcher::PrepareRequest(
       MemoryCache::RemoveFragmentIdentifierIfNeeded(request.Url()),
       request.Options(),
       /* Don't send security violation reports for speculative preloads */
-      request.IsSpeculativePreload()
-          ? SecurityViolationReportingPolicy::kSuppressReporting
-          : SecurityViolationReportingPolicy::kReport,
-      request.GetOriginRestriction());
+      reporting_policy, request.GetOriginRestriction());
   if (blocked_reason != ResourceRequestBlockedReason::kNone) {
     DCHECK(!substitute_data.ForceSynchronousLoad());
     return kBlock;