Update dangling markup mitigations.

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/loader/BaseFetchContext.h"
 
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/ContentSettingsClient.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/ConsoleMessage.h"
@@ skipping 272 matching lines @@
       CountDeprecation(
           UseCounter::kRequestedSubresourceWithEmbeddedCredentials);
       // TODO(mkwst): Remove the runtime-enabled check in M59:
       // https://www.chromestatus.com/feature/5669008342777856
       if (RuntimeEnabledFeatures::blockCredentialedSubresourcesEnabled())
         return ResourceRequestBlockedReason::kOrigin;
     }
   }
 
   // Check for mixed content. We do this second-to-last so that when folks block
-  // mixed content with a CSP policy, they don't get a warning. They'll still
-  // get a warning in the console about CSP blocking the load.
+  // mixed content via CSP, they don't get a mixed content warning, but a CSP
+  // warning instead.
   if (ShouldBlockFetchByMixedContentCheck(resource_request, url,
                                           reporting_policy))
     return ResourceRequestBlockedReason::kMixedContent;
 
-  if (url.WhitespaceRemoved()) {
+  if (url.PotentiallyDanglingMarkup() && url.ProtocolIsInHTTPFamily()) {
     CountDeprecation(UseCounter::kCanRequestURLHTTPContainingNewline);
-    if (url.ProtocolIsInHTTPFamily()) {
-      if (RuntimeEnabledFeatures::restrictCanRequestURLCharacterSetEnabled())
-        return ResourceRequestBlockedReason::kOther;
-    } else {
-      CountUsage(UseCounter::kCanRequestURLNonHTTPContainingNewline);
-    }
+    if (RuntimeEnabledFeatures::restrictCanRequestURLCharacterSetEnabled())
+      return ResourceRequestBlockedReason::kOther;
   }
 
   // Let the client have the final say into whether or not the load should
   // proceed.
   if (GetSubresourceFilter() && type != Resource::kMainResource &&
       type != Resource::kImportResource) {
     if (!GetSubresourceFilter()->AllowLoad(
             url, resource_request.GetRequestContext(), reporting_policy)) {
       return ResourceRequestBlockedReason::kSubresourceFilter;
     }
   }
 
   return ResourceRequestBlockedReason::kNone;
 }
 
 DEFINE_TRACE(BaseFetchContext) {
   visitor->Trace(execution_context_);
   FetchContext::Trace(visitor);
 }
 
 }  // namespace blink