Move HistoryItem handling to DocumentLoader

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 810 matching lines @@
 }
 
 bool Internals::hasAutofocusRequest() {
   return hasAutofocusRequest(0);
 }
 
 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.");
     return Vector<String>();
   }
   return mainItem->getDocumentState();
 }
 
 void Internals::setFormControlStateOfHistoryItem(
     const Vector<String>& state,
     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.");
     return;
   }
   mainItem->clearDocumentState();
   mainItem->setDocumentState(state);
 }
 
 DOMWindow* Internals::pagePopupWindow() const {
@@ skipping 1495 matching lines @@
 }
 
 CallbackFunctionTest* Internals::callbackFunctionTest() const {
   return CallbackFunctionTest::create();
 }
 
 Vector<String> Internals::getReferencedFilePaths() const {
   if (!frame())
     return Vector<String>();
 
-  return frame()->loader().currentItem()->getReferencedFilePaths();
+  return frame()
+      ->loader()
+      .documentLoader()
+      ->historyItem()
+      ->getReferencedFilePaths();
 }
 
 void Internals::startStoringCompositedLayerDebugInfo(
     Document* document,
     ExceptionState& exceptionState) {
   DCHECK(document);
   if (!document->view()) {
     exceptionState.throwDOMException(InvalidAccessError,
                                      "The document provided is invalid.");
     return;
@@ skipping 844 matching lines @@
 
 void Internals::crash() {
   CHECK(false) << "Intentional crash";
 }
 
 void Internals::setIsLowEndDevice(bool isLowEndDevice) {
   MemoryCoordinator::setIsLowEndDeviceForTesting(isLowEndDevice);
 }
 
 }  // namespace blink