| Index: content/public/test/render_view_test.cc
|
| diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
|
| index 364e5a80d0961d188f73b1630b0ddaced9f95ba9..a1b7747f4906aea14fee387c54468b1a343cf958 100644
|
| --- a/content/public/test/render_view_test.cc
|
| +++ b/content/public/test/render_view_test.cc
|
| @@ -145,17 +145,18 @@ void RenderViewTest::LoadHTML(const char* html) {
|
| 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() {
|
| @@ -420,8 +421,7 @@ 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() +
|
| @@ -435,7 +435,7 @@ void RenderViewTest::GoToOffset(int offset,
|
| 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(),
|
|
|