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 c20779307d2bc66bfc3dfcd33fcc9dabe319e07f..a990a471122b00b89138dc5f63c155e236280608 100644
--- a/third_party/WebKit/Source/core/testing/Internals.cpp
+++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -870,7 +870,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.");
@@ -884,7 +884,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.");
@@ -2386,7 +2386,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(