Split CSP into pre- and post-upgrade checks

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

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 153 matching lines @@
   ResourceRequest& new_request(passed_new_request.ToMutableResourceRequest());
   const ResourceResponse& redirect_response(
       passed_redirect_response.ToResourceResponse());
 
   new_request.SetRedirectStatus(
       ResourceRequest::RedirectStatus::kFollowedRedirect);
 
   const KURL original_url = new_request.Url();
 
   if (!IsManualRedirectFetchRequest(resource_->GetResourceRequest())) {
-    ResourceRequestBlockedReason blocked_reason = Context().CanRequest(
+    ResourceRequestBlockedReason blocked_reason = Context().CanFollowRedirect(
         resource_->GetType(), new_request, new_request.Url(),
         resource_->Options(),
         /* Don't send security violation reports for unused preloads */
         (resource_->IsUnusedPreload()
              ? SecurityViolationReportingPolicy::kSuppressReporting
              : SecurityViolationReportingPolicy::kReport),
         FetchParameters::kUseDefaultOriginRestrictionForType);
     if (blocked_reason != ResourceRequestBlockedReason::kNone) {
       CancelForRedirectAccessCheckError(new_request.Url(), blocked_reason);
       return false;
@@ skipping 337 matching lines @@
     return;
 
   // Don't activate if cache policy is explicitly set.
   if (request.GetCachePolicy() != WebCachePolicy::kUseProtocolCachePolicy)
     return;
 
   is_cache_aware_loading_activated_ = true;
 }
 
 }  // namespace blink