PlzNavigate: fix two RenderViewImplTests related to history

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 <stddef.h>
 
 #include <cctype>
 
@@ skipping 262 matching lines @@
     // cannot include out-of-process frames.
     TestRenderFrame* frame =
         static_cast<TestRenderFrame*>(view_impl->GetMainRenderFrame());
     return SingleHistoryItemToPageState(frame->current_history_item());
   } else {
     return HistoryEntryToPageState(
         view_impl->history_controller()->GetCurrentEntry());
   }
 }
 
-void RenderViewTest::GoBack(const PageState& state) {
-  GoToOffset(-1, state);
+void RenderViewTest::GoBack(const GURL& url, const PageState& state) {
+  GoToOffset(-1, url, state);
 }
 
-void RenderViewTest::GoForward(const PageState& state) {
-  GoToOffset(1, state);
+void RenderViewTest::GoForward(const GURL& url, const PageState& state) {
+  GoToOffset(1, url, state);
 }
 
 void RenderViewTest::SetUp() {
   // Blink needs to be initialized before calling CreateContentRendererClient()
   // because it uses blink internally.
   blink::initialize(blink_platform_impl_.Get());
 
   content_client_.reset(CreateContentClient());
   content_browser_client_.reset(CreateContentBrowserClient());
   content_renderer_client_.reset(CreateContentRendererClient());
@@ skipping 391 matching lines @@
 }
 
 ContentRendererClient* RenderViewTest::CreateContentRendererClient() {
   return new ContentRendererClient;
 }
 
 scoped_ptr<ResizeParams> RenderViewTest::InitialSizeParams() {
   return make_scoped_ptr(new ResizeParams());
 }
 
-void RenderViewTest::GoToOffset(int offset, const PageState& state) {
+void RenderViewTest::GoToOffset(int offset,
+                                const GURL& url,
+                                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_;
 
   CommonNavigationParams common_params(
-      GURL(), Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK,
+      url, Referrer(), ui::PAGE_TRANSITION_FORWARD_BACK,
       FrameMsg_Navigate_Type::NORMAL, true, false, base::TimeTicks(),
       FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(),
       LOFI_UNSPECIFIED, base::TimeTicks::Now(), "GET");
   RequestNavigationParams request_params;
   request_params.page_state = state;
   request_params.page_id = impl->page_id_ + offset;
   request_params.nav_entry_id = pending_offset + 1;
   request_params.pending_history_list_offset = pending_offset;
   request_params.current_history_list_offset = impl->history_list_offset_;
   request_params.current_history_list_length = history_list_length;
 
   TestRenderFrame* frame =
       static_cast<TestRenderFrame*>(impl->GetMainRenderFrame());
   frame->Navigate(common_params, StartNavigationParams(), request_params);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   FrameLoadWaiter(frame).Wait();
 }
 
 }  // namespace content