Split CSP into pre- and post-upgrade checks

third_party/WebKit/Source/platform/loader/fetch/FetchContext.h

Index: third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
diff --git a/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h b/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
index 302da78c7b5be596797a862ae5894faee3d0ba54..dd94fc17a7615fb4017ffbaccef805c3ba837b56 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
+++ b/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
@@ -38,6 +38,7 @@
 #include "platform/loader/fetch/Resource.h"
 #include "platform/loader/fetch/ResourceLoadPriority.h"
 #include "platform/loader/fetch/ResourceRequest.h"
+#include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/weborigin/SecurityViolationReportingPolicy.h"
 #include "platform/wtf/Forward.h"
 #include "platform/wtf/Noncopyable.h"
@@ -154,6 +155,15 @@ class PLATFORM_EXPORT FetchContext
       FetchRequest::OriginRestriction) const {
     return ResourceRequestBlockedReason::kOther;
   }
+  virtual ResourceRequestBlockedReason CanFollowRedirect(
+      Resource::Type,
+      const ResourceRequest&,
+      const KURL&,
+      const ResourceLoaderOptions&,
+      SecurityViolationReportingPolicy,
+      FetchRequest::OriginRestriction) const {
+    return ResourceRequestBlockedReason::kOther;
+  }
   virtual ResourceRequestBlockedReason AllowResponse(
       Resource::Type,
       const ResourceRequest&,
@@ -180,9 +190,12 @@ class PLATFORM_EXPORT FetchContext
   // Populates the ResourceRequest using the given values and information
   // stored in the FetchContext implementation. Used by ResourceFetcher to
   // prepare a ResourceRequest instance at the start of resource loading.
-  virtual void PopulateResourceRequest(Resource::Type,
+  virtual void PopulateResourceRequest(const KURL&,
+                                       Resource::Type,
                                        const ClientHintsPreferences&,
                                        const FetchRequest::ResourceWidth&,
+                                       const ResourceLoaderOptions&,
+                                       SecurityViolationReportingPolicy,
                                        ResourceRequest&);
   // Sets the first party for cookies and requestor origin using information
   // stored in the FetchContext implementation.