Restrict effective 2g blocking to cases where NQE says we are 2G-like.

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

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 167 matching lines @@
   // Add the metadata that this page has scripts inserted via document.write
   // that are eligible for blocking. Note that if there are multiple scripts
   // the flag will be conveyed to the browser process only once.
   document.loader()->didObserveLoadingBehavior(
       WebLoadingBehaviorFlag::WebLoadingBehaviorDocumentWriteBlock);
 
   const bool is2G =
       networkStateNotifier().connectionType() == WebConnectionTypeCellular2G;
   WebEffectiveConnectionType effectiveConnection =
       document.frame()->client()->getEffectiveConnectionType();
-  const bool is2GOrLike2G =
-      is2G || isConnectionEffectively2G(effectiveConnection);
 
   return document.settings()
              ->getDisallowFetchForDocWrittenScriptsInMainFrame() ||
          (document.settings()
               ->getDisallowFetchForDocWrittenScriptsInMainFrameOnSlowConnections() &&
           is2G) ||
          (document.settings()
               ->getDisallowFetchForDocWrittenScriptsInMainFrameIfEffectively2G() &&
-          is2GOrLike2G);
+          isConnectionEffectively2G(effectiveConnection));
 }
 
 }  // namespace
 
 FrameFetchContext::FrameFetchContext(DocumentLoader* loader, Document* document)
     : m_document(document), m_documentLoader(loader) {
   DCHECK(frame());
 }
 
 FrameFetchContext::~FrameFetchContext() {
@@ skipping 850 matching lines @@
                                                     response);
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink