Move HistoryItem handling to DocumentLoader

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index b32fcc1acb9da6242273a65169a6841ba8c3610c..0efb7f7a8e200dbc4637024d0d9eb13afdbd82fe 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -2410,7 +2410,8 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorWrittenToHistoryItem) {
   webViewHelper.webView()->setPageScaleFactor(3);
   EXPECT_EQ(3, toLocalFrame(webViewHelper.webView()->page()->mainFrame())
                    ->loader()
-                   .currentItem()
+                   .documentLoader()
+                   ->historyItem()
                    ->pageScaleFactor());
 }
 
@@ -2435,7 +2436,8 @@ TEST_P(ParameterizedWebFrameTest, initialScaleWrittenToHistoryItem) {
   EXPECT_EQ(minimumPageScaleFactor,
             toLocalFrame(webViewHelper.webView()->page()->mainFrame())
                 ->loader()
-                .currentItem()
+                .documentLoader()
+                ->historyItem()
                 ->pageScaleFactor());
 }
 
@@ -7032,17 +7034,18 @@ TEST_P(ParameterizedWebFrameTest, BackToReload) {
   WebFrame* frame = webViewHelper.webView()->mainFrame();
   const FrameLoader& mainFrameLoader =
       webViewHelper.webView()->mainFrameImpl()->frame()->loader();
-  Persistent<HistoryItem> firstItem = mainFrameLoader.currentItem();
+  Persistent<HistoryItem> firstItem =
+      mainFrameLoader.documentLoader()->historyItem();
   EXPECT_TRUE(firstItem);
 
   registerMockedHttpURLLoad("white-1x1.png");
   FrameTestHelpers::loadFrame(frame, m_baseURL + "white-1x1.png");
-  EXPECT_NE(firstItem.get(), mainFrameLoader.currentItem());
+  EXPECT_NE(firstItem.get(), mainFrameLoader.documentLoader()->historyItem());
 
   FrameTestHelpers::loadHistoryItem(frame, WebHistoryItem(firstItem.get()),
                                     WebHistoryDifferentDocumentLoad,
                                     WebCachePolicy::UseProtocolCachePolicy);
-  EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
+  EXPECT_EQ(firstItem.get(), mainFrameLoader.documentLoader()->historyItem());
 
   FrameTestHelpers::reloadFrame(frame);
   EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
@@ -7076,8 +7079,9 @@ TEST_P(ParameterizedWebFrameTest, BackDuringChildFrameReload) {
 
   FrameTestHelpers::reloadFrame(childFrame);
   EXPECT_EQ(item.urlString(), mainFrame->document().url().string());
-  EXPECT_EQ(item.urlString(),
-            WebString(mainFrameLoader.currentItem()->urlString()));
+  EXPECT_EQ(
+      item.urlString(),
+      WebString(mainFrameLoader.documentLoader()->historyItem()->urlString()));
 }
 
 TEST_P(ParameterizedWebFrameTest, ReloadPost) {
@@ -7110,18 +7114,19 @@ TEST_P(ParameterizedWebFrameTest, LoadHistoryItemReload) {
   WebFrame* frame = webViewHelper.webView()->mainFrame();
   const FrameLoader& mainFrameLoader =
       webViewHelper.webView()->mainFrameImpl()->frame()->loader();
-  Persistent<HistoryItem> firstItem = mainFrameLoader.currentItem();
+  Persistent<HistoryItem> firstItem =
+      mainFrameLoader.documentLoader()->historyItem();
   EXPECT_TRUE(firstItem);
 
   registerMockedHttpURLLoad("white-1x1.png");
   FrameTestHelpers::loadFrame(frame, m_baseURL + "white-1x1.png");
-  EXPECT_NE(firstItem.get(), mainFrameLoader.currentItem());
+  EXPECT_NE(firstItem.get(), mainFrameLoader.documentLoader()->historyItem());
 
   // Cache policy overrides should take.
   FrameTestHelpers::loadHistoryItem(frame, WebHistoryItem(firstItem),
                                     WebHistoryDifferentDocumentLoad,
                                     WebCachePolicy::ValidatingCacheData);
-  EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
+  EXPECT_EQ(firstItem.get(), mainFrameLoader.documentLoader()->historyItem());
   EXPECT_EQ(WebCachePolicy::ValidatingCacheData,
             frame->dataSource()->getRequest().getCachePolicy());
 }
@@ -7399,17 +7404,18 @@ TEST_P(ParameterizedWebFrameTest, SameDocumentHistoryNavigationCommitType) {
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
       m_baseURL + "push_state.html", true, &client);
-  Persistent<HistoryItem> item =
-      toLocalFrame(webViewImpl->page()->mainFrame())->loader().currentItem();
+  Persistent<HistoryItem> item = toLocalFrame(webViewImpl->page()->mainFrame())
+                                     ->loader()
+                                     .documentLoader()
+                                     ->historyItem();
   runPendingTasks();
 
   toLocalFrame(webViewImpl->page()->mainFrame())
       ->loader()
-      .load(
-          FrameLoadRequest(
-              nullptr, FrameLoader::resourceRequestFromHistoryItem(
-                           item.get(), WebCachePolicy::UseProtocolCachePolicy)),
-          FrameLoadTypeBackForward, item.get(), HistorySameDocumentLoad);
+      .load(FrameLoadRequest(nullptr,
+                             item->generateResourceRequest(
+                                 WebCachePolicy::UseProtocolCachePolicy)),
+            FrameLoadTypeBackForward, item.get(), HistorySameDocumentLoad);
   EXPECT_EQ(WebBackForwardCommit, client.lastCommitType());
 }
 
@@ -7535,12 +7541,12 @@ TEST_P(ParameterizedWebFrameTest, CurrentHistoryItem) {
   frame->loadRequest(request);
 
   // Before commit, there is no history item.
-  EXPECT_FALSE(mainFrameLoader.currentItem());
+  EXPECT_FALSE(mainFrameLoader.documentLoader()->historyItem());
 
   FrameTestHelpers::pumpPendingRequestsForFrameToLoad(frame);
 
   // After commit, there is.
-  HistoryItem* item = mainFrameLoader.currentItem();
+  HistoryItem* item = mainFrameLoader.documentLoader()->historyItem();
   ASSERT_TRUE(item);
   EXPECT_EQ(WTF::String(url.data()), item->urlString());
 }