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 082a5644dbed43163e3235214db9bef2c2f54ddb..df57f797e4dad5e9b2a5a16abc7851e4a9bd0269 100644
--- a/third_party/WebKit/Source/core/testing/Internals.cpp
+++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -828,7 +828,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.");
@@ -842,7 +842,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.");
@@ -2358,7 +2358,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(