Move HistoryItem handling to DocumentLoader

third_party/WebKit/Source/core/testing/Internals.cpp

Index: third_party/WebKit/Source/core/testing/Internals.cpp
diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
index 4013488276a476bca3cf83d44f34a0162f7312a9..71d1a2e793e864ebe73f4e1a3446b8381e1b4752 100644
--- a/third_party/WebKit/Source/core/testing/Internals.cpp
+++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -827,7 +827,7 @@ Vector<String> Internals::formControlStateOfHistoryItem(
     ExceptionState& exceptionState) {
   HistoryItem* mainItem = nullptr;
   if (frame())
-    mainItem = frame()->loader().currentItem();
+    mainItem = frame()->loader().documentLoader()->historyItem();
   if (!mainItem) {
     exceptionState.throwDOMException(InvalidAccessError,
                                      "No history item is available.");
@@ -841,7 +841,7 @@ void Internals::setFormControlStateOfHistoryItem(
     ExceptionState& exceptionState) {
   HistoryItem* mainItem = nullptr;
   if (frame())
-    mainItem = frame()->loader().currentItem();
+    mainItem = frame()->loader().documentLoader()->historyItem();
   if (!mainItem) {
     exceptionState.throwDOMException(InvalidAccessError,
                                      "No history item is available.");
@@ -2343,7 +2343,11 @@ Vector<String> Internals::getReferencedFilePaths() const {
   if (!frame())
     return Vector<String>();
 
-  return frame()->loader().currentItem()->getReferencedFilePaths();
+  return frame()
+      ->loader()
+      .documentLoader()
+      ->historyItem()
+      ->getReferencedFilePaths();
 }
 
 void Internals::startStoringCompositedLayerDebugInfo(