Move HistoryItem handling to DocumentLoader

third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp

 // Copyright 2014 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/inspector/InspectorResourceContentLoader.h"
 
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/InspectedFrames.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorPageAgent.h"
+#include "core/loader/DocumentLoader.h"
 #include "core/loader/resource/CSSStyleSheetResource.h"
 #include "core/loader/resource/StyleSheetResourceClient.h"
 #include "core/page/Page.h"
 #include "platform/loader/fetch/FetchInitiatorTypeNames.h"
 #include "platform/loader/fetch/RawResource.h"
 #include "platform/loader/fetch/Resource.h"
 #include "platform/loader/fetch/ResourceFetcher.h"
 #include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebURLRequest.h"
 
@@ skipping 80 matching lines @@
   InspectedFrames* inspectedFrames = InspectedFrames::create(m_inspectedFrame);
   for (LocalFrame* frame : *inspectedFrames) {
     documents.push_back(frame->document());
     documents.appendVector(InspectorPageAgent::importsForFrame(frame));
   }
   for (Document* document : documents) {
     HashSet<String> urlsToFetch;
 
     ResourceRequest resourceRequest;
     HistoryItem* item =
-        document->frame() ? document->frame()->loader().currentItem() : nullptr;
+        document->loader() ? document->loader()->historyItem() : nullptr;
     if (item) {
-      resourceRequest = FrameLoader::resourceRequestFromHistoryItem(
-          item, WebCachePolicy::ReturnCacheDataDontLoad);
+      resourceRequest = item->generateResourceRequest(
+          WebCachePolicy::ReturnCacheDataDontLoad);
     } else {
       resourceRequest = document->url();
       resourceRequest.setCachePolicy(WebCachePolicy::ReturnCacheDataDontLoad);
     }
     resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
 
     if (!resourceRequest.url().getString().isEmpty()) {
       urlsToFetch.insert(resourceRequest.url().getString());
       FetchRequest request(resourceRequest, FetchInitiatorTypeNames::internal);
       Resource* resource = RawResource::fetch(request, document->fetcher());
@@ skipping 98 matching lines @@
       (*callback)();
   }
 }
 
 void InspectorResourceContentLoader::resourceFinished(ResourceClient* client) {
   m_pendingResourceClients.erase(client);
   checkDone();
 }
 
 }  // namespace blink