Split methods for ClientHintsPreferences from FrameFetchContext

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 23 matching lines @@
 #include "core/dom/Document.h"
 #include "core/fetch/ClientHintsPreferences.h"
 #include "core/fetch/ResourceLoadingLog.h"
 #include "core/fetch/UniqueIdentifier.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
+#include "core/frame/UseCounter.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/imports/HTMLImportsController.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorNetworkAgent.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/loader/DocumentLoader.h"
+#include "core/loader/FrameClientHintsPreferencesContext.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/MixedContentChecker.h"
 #include "core/loader/NetworkHintsInterface.h"
 #include "core/loader/PingLoader.h"
 #include "core/loader/ProgressTracker.h"
 #include "core/loader/appcache/ApplicationCacheHost.h"
 #include "core/page/NetworkStateNotifier.h"
 #include "core/page/Page.h"
 #include "core/paint/FirstMeaningfulPaintDetector.h"
@@ skipping 864 matching lines @@
   // should the output be spread back across multiple processes?
   if (!frame()->tree().parent()->isLocalFrame())
     return nullptr;
   return toLocalFrame(frame()->tree().parent())
       ->loader()
       .documentLoader()
       ->fetcher()
       ->archive();
 }
 
-void FrameFetchContext::countClientHintsDPR() {
-  UseCounter::count(frame(), UseCounter::ClientHintsDPR);
-}
-
-void FrameFetchContext::countClientHintsResourceWidth() {
-  UseCounter::count(frame(), UseCounter::ClientHintsResourceWidth);
-}
-
-void FrameFetchContext::countClientHintsViewportWidth() {
-  UseCounter::count(frame(), UseCounter::ClientHintsViewportWidth);
-}
-
 ResourceLoadPriority FrameFetchContext::modifyPriorityForExperiments(
     ResourceLoadPriority priority) {
   // If Settings is null, we can't verify any experiments are in force.
   if (!frame()->settings())
     return priority;
 
   // If enabled, drop the priority of all resources in a subframe.
   if (frame()->settings()->lowPriorityIframes() && !frame()->isMainFrame())
     return ResourceLoadPriorityVeryLow;
 
@@ skipping 11 matching lines @@
     WebURLRequest::RequestContext requestContext,
     Resource* resource,
     LinkLoader::CanLoadResources resourceLoadingPolicy) {
   TRACE_EVENT1(
       "devtools.timeline", "ResourceReceiveResponse", "data",
       InspectorReceiveResponseEvent::data(identifier, frame(), response));
   MixedContentChecker::checkMixedPrivatePublic(frame(),
                                                response.remoteIPAddress());
   if (m_documentLoader &&
       m_documentLoader == frame()->loader().provisionalDocumentLoader()) {
-    ResourceFetcher* fetcher = nullptr;
-    if (frame()->document())
-      fetcher = frame()->document()->fetcher();
+    FrameClientHintsPreferencesContext hintsContext(frame());
     m_documentLoader->clientHintsPreferences()
         .updateFromAcceptClientHintsHeader(
-            response.httpHeaderField(HTTPNames::Accept_CH), fetcher);
+            response.httpHeaderField(HTTPNames::Accept_CH), &hintsContext);
     // When response is received with a provisional docloader, the resource
     // haven't committed yet, and we cannot load resources, only preconnect.
     resourceLoadingPolicy = LinkLoader::DoNotLoadResources;
   }
   LinkLoader::loadLinksFromHeader(
       response.httpHeaderField(HTTPNames::Link), response.url(),
       frame()->document(), NetworkHintsInterfaceImpl(), resourceLoadingPolicy,
       LinkLoader::LoadAll, nullptr);
 
   if (response.hasMajorCertificateErrors()) {
@@ skipping 11 matching lines @@
                                                     response);
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink