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

third_party/WebKit/Source/core/fetch/FetchContext.h

Index: third_party/WebKit/Source/core/fetch/FetchContext.h
diff --git a/third_party/WebKit/Source/core/fetch/FetchContext.h b/third_party/WebKit/Source/core/fetch/FetchContext.h
index ebd4f5a6bc918b393f4853f906f23c3d604df5cf..45cd4c560fc427c988b2c9511f9fc70efed7d094 100644
--- a/third_party/WebKit/Source/core/fetch/FetchContext.h
+++ b/third_party/WebKit/Source/core/fetch/FetchContext.h
@@ -37,6 +37,7 @@
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/Resource.h"
 #include "platform/heap/Handle.h"
+#include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/network/ResourceLoadPriority.h"
 #include "wtf/Noncopyable.h"
 
@@ -123,6 +124,15 @@ class CORE_EXPORT FetchContext
 
   virtual void addResourceTiming(const ResourceTimingInfo&);
   virtual bool allowImage(bool, const KURL&) const { return false; }
+  virtual ResourceRequestBlockedReason checkCSPForRequest(
+      const ResourceRequest&,
+      const KURL&,
+      const ResourceLoaderOptions&,
+      bool forPreload,
+      ResourceRequest::RedirectStatus,
+      ContentSecurityPolicyHeaderType) const {
+    return ResourceRequestBlockedReasonCSP;
+  }
   virtual bool canRequest(Resource::Type,
                           const ResourceRequest&,
                           const KURL&,