Remove WebHistoryItem child usage

content/public/test/render_view_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/render_view_test.h"
 
 #include "base/run_loop.h"
 #include "content/common/dom_storage/dom_storage_types.h"
 #include "content/common/frame_messages.h"
 #include "content/common/input_messages.h"
@@ skipping 127 matching lines @@
   std::string url_str = "data:text/html;charset=utf-8,";
   url_str.append(html);
   GURL url(url_str);
   FrameLoadWaiter waiter(view_, &msg_loop_);
   GetMainFrame()->loadRequest(WebURLRequest(url));
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   waiter.Wait();
 }
 
-void RenderViewTest::GoBack(const blink::WebHistoryItem& item) {
-  GoToOffset(-1, item);
+void RenderViewTest::GoBack(const PageState& state) {
+  GoToOffset(-1, state);
 }
 
-void RenderViewTest::GoForward(const blink::WebHistoryItem& item) {
-  GoToOffset(1, item);
+void RenderViewTest::GoForward(const PageState& state) {
+  GoToOffset(1, state);
 }
 
 void RenderViewTest::GoBackToPrevious() {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
-  GoBack(impl->history_controller()->GetPreviousItemForExport());
+  GoBack(HistoryEntryToPageState(
+      impl->history_controller()->GetPreviousEntry()));
 }
 
 void RenderViewTest::SetUp() {
   content_client_.reset(CreateContentClient());
   content_browser_client_.reset(CreateContentBrowserClient());
   content_renderer_client_.reset(CreateContentRendererClient());
   SetContentClient(content_client_.get());
   SetBrowserClientForTesting(content_browser_client_.get());
   SetRendererClientForTesting(content_renderer_client_.get());
 
@@ skipping 244 matching lines @@
 }
 
 ContentBrowserClient* RenderViewTest::CreateContentBrowserClient() {
   return new ContentBrowserClient;
 }
 
 ContentRendererClient* RenderViewTest::CreateContentRendererClient() {
   return new ContentRendererClient;
 }
 
-void RenderViewTest::GoToOffset(int offset,
-                                const blink::WebHistoryItem& history_item) {
+void RenderViewTest::GoToOffset(int offset, const PageState& state) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
 
   int history_list_length = impl->historyBackListCount() +
                             impl->historyForwardListCount() + 1;
   int pending_offset = offset + impl->history_list_offset();
 
   FrameMsg_Navigate_Params navigate_params;
   navigate_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   navigate_params.transition = PAGE_TRANSITION_FORWARD_BACK;
   navigate_params.current_history_list_length = history_list_length;
   navigate_params.current_history_list_offset = impl->history_list_offset();
   navigate_params.pending_history_list_offset = pending_offset;
   navigate_params.page_id = impl->GetPageId() + offset;
-  navigate_params.page_state = HistoryItemToPageState(history_item);
+  navigate_params.page_state = state;
   navigate_params.request_time = base::Time::Now();
 
   FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(),
                                      navigate_params);
   impl->main_render_frame()->OnMessageReceived(navigate_message);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   ProcessPendingMessages();
 }
 
 }  // namespace content