Split CSP into pre- and post-upgrade checks

third_party/WebKit/Source/core/loader/DocumentLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * 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 474 matching lines @@
   // If the redirecting url is not allowed to display content from the target
   // origin, then block the redirect.
   const KURL& request_url = request_.Url();
   RefPtr<SecurityOrigin> redirecting_origin =
       SecurityOrigin::Create(redirect_response.Url());
   if (!redirecting_origin->CanDisplay(request_url)) {
     FrameLoader::ReportLocalLoadFailed(frame_, request_url.GetString());
     fetcher_->StopFetching();
     return false;
   }
-  if (GetFrameLoader().ShouldContinueForNavigationPolicy(
+  if (GetFrameLoader().ShouldContinueForRedirectNavigationPolicy(
           request_, SubstituteData(), this, kCheckContentSecurityPolicy,
           navigation_type_, kNavigationPolicyCurrentTab, load_type_,
           IsClientRedirect(), nullptr) != kNavigationPolicyCurrentTab) {
     fetcher_->StopFetching();
     return false;
   }
 
   DCHECK(GetTiming().FetchStart());
   AppendRedirect(request_url);
   GetTiming().AddRedirect(redirect_response.Url(), request_url);
@@ skipping 608 matching lines @@
                      InstallNewDocumentReason::kJavascriptURL,
                      kForceSynchronousParsing, KURL());
   if (!source.IsNull())
     writer_->AppendReplacingData(source);
   EndWriting();
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink