PlzNavigate: fix two RenderViewImplTests related to history

content/renderer/render_view_browsertest.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 1438 matching lines @@
 
   LoadHTML("<div id=pagename>Page C</div>");
   int was_page_c = -1;
   base::string16 check_page_c =
       base::ASCIIToUTF16(
           "Number(document.getElementById('pagename').innerHTML == 'Page C')");
   EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_c, &was_page_c));
   EXPECT_EQ(1, was_page_c);
 
   PageState forward_state = GetCurrentPageState();
-  GoBack(back_state);

[Charlie Reis, 2016/03/18 17:43:23]

Why not update GoBack itself (in RenderViewTest) by passing in a URL along with
the PageState?  That would probably let you fix
ChromeRenderViewTest.BackToTranslatablePage as well.

[clamy, 2016/03/23 15:23:08]

Done.

+
+  // Go back.
+  CommonNavigationParams common_params_b;
+  common_params_b.url =
+      GURL("data:text/html;charset=utf-8,<div id=pagename>Page B</div>");
+  common_params_b.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+  GoToOffsetWithParams(-1, back_state, common_params_b,
+                       StartNavigationParams(), RequestNavigationParams());
+
   EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_b, &was_page_b));
   EXPECT_EQ(1, was_page_b);
-
   PageState back_state2 = GetCurrentPageState();
 
-  GoForward(forward_state);

[Charlie Reis, 2016/03/18 17:43:23]

Same here.

[clamy, 2016/03/23 15:23:08]

Done.

+  // Go forward.
+  CommonNavigationParams common_params_c;
+  common_params_c.url =
+      GURL("data:text/html;charset=utf-8,<div id=pagename>Page C</div>");
+  common_params_c.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+  GoToOffsetWithParams(1, forward_state, common_params_c,
+                       StartNavigationParams(), RequestNavigationParams());
   EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_c, &was_page_c));
   EXPECT_EQ(1, was_page_c);
 
-  GoBack(back_state2);
+  // Go back.
+  GoToOffsetWithParams(-1, back_state2, common_params_b,
+                       StartNavigationParams(), RequestNavigationParams());
   EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_b, &was_page_b));
   EXPECT_EQ(1, was_page_b);
 
   forward_state = GetCurrentPageState();
-  GoBack(page_a_state);
+
+  // Go back.
+  CommonNavigationParams common_params_a;
+  common_params_a.url =
+      GURL("data:text/html;charset=utf-8,<div id=pagename>Page A</div>");
+  common_params_a.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+  GoToOffsetWithParams(-1, page_a_state, common_params_a,
+                       StartNavigationParams(), RequestNavigationParams());
   EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_a, &was_page_a));
   EXPECT_EQ(1, was_page_a);
 
-  GoForward(forward_state);
+  // Go forward.
+  GoToOffsetWithParams(1, forward_state, common_params_b,
+                       StartNavigationParams(), RequestNavigationParams());
   EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_b, &was_page_b));
   EXPECT_EQ(1, was_page_b);
 }
 
 #if defined(OS_MACOSX) || defined(USE_AURA)
 TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
 #if defined(OS_WIN)
   // http://crbug.com/304193
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return;
@@ skipping 550 matching lines @@
 
 TEST_F(RenderViewImplTest, BrowserNavigationStartNotUsedForHistoryNavigation) {
   LoadHTML("<div id=pagename>Page A</div>");
   LoadHTML("<div id=pagename>Page B</div>");
   PageState back_state = GetCurrentPageState();
   LoadHTML("<div id=pagename>Page C</div>");
   PageState forward_state = GetCurrentPageState();
   ProcessPendingMessages();
   render_thread_->sink().ClearMessages();
 
-  CommonNavigationParams common_params;
-  common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   // Go back.
-  GoToOffsetWithParams(-1, back_state, common_params, StartNavigationParams(),
-                       RequestNavigationParams());
+  CommonNavigationParams common_params_back;
+  common_params_back.url =
+      GURL("data:text/html;charset=utf-8,<div id=pagename>Page B</div>");
+  common_params_back.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+  GoToOffsetWithParams(-1, back_state, common_params_back,
+                       StartNavigationParams(), RequestNavigationParams());
   FrameHostMsg_DidStartProvisionalLoad::Param host_nav_params =
       ProcessAndReadIPC<FrameHostMsg_DidStartProvisionalLoad>();
   EXPECT_PRED2(TimeTicksGT, base::get<1>(host_nav_params),
-               common_params.navigation_start);
+               common_params_back.navigation_start);
   render_thread_->sink().ClearMessages();
 
   // Go forward.
-  GoToOffsetWithParams(1, forward_state, common_params,
-                             StartNavigationParams(),
-                             RequestNavigationParams());
+  CommonNavigationParams common_params_forward;
+  common_params_forward.url =
+      GURL("data:text/html;charset=utf-8,<div id=pagename>Page C</div>");
+  common_params_forward.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+  GoToOffsetWithParams(1, forward_state, common_params_forward,
+                       StartNavigationParams(), RequestNavigationParams());
   FrameHostMsg_DidStartProvisionalLoad::Param host_nav_params2 =
       ProcessAndReadIPC<FrameHostMsg_DidStartProvisionalLoad>();
   EXPECT_PRED2(TimeTicksGT, base::get<1>(host_nav_params2),
-               common_params.navigation_start);
+               common_params_forward.navigation_start);
 }
 
 TEST_F(RenderViewImplTest, BrowserNavigationStartSuccessfullyTransmitted) {
   CommonNavigationParams common_params;
   common_params.url = GURL("data:text/html,<div>Page</div>");
   common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params.transition = ui::PAGE_TRANSITION_TYPED;
 
   frame()->Navigate(common_params, StartNavigationParams(),
                     RequestNavigationParams());
@@ skipping 259 matching lines @@
       FROM_HERE,
       base::Bind(&DevToolsAgentTest::CloseWhilePaused, base::Unretained(this)));
   ExecuteJavaScriptForTests("debugger;");
 
   // CloseWhilePaused should resume execution and continue here.
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content