Classify navigations without page id in parallel to the existing classifier.

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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/shared_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 691 matching lines @@
 
   // Back to page A (page_id 1) and commit.
   CommonNavigationParams common_params_A;
   RequestNavigationParams request_params_A;
   common_params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params_A.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   request_params_A.current_history_list_length = 2;
   request_params_A.current_history_list_offset = 1;
   request_params_A.pending_history_list_offset = 0;
   request_params_A.page_id = 1;
+  request_params_A.nav_entry_id = 1;
   request_params_A.page_state = state_A;
   NavigateFrame(common_params_A, StartNavigationParams(), request_params_A);
   EXPECT_EQ(1, view()->historyBackListCount());
   EXPECT_EQ(2, view()->historyBackListCount() +
       view()->historyForwardListCount() + 1);
   ProcessPendingMessages();
 
   // Respond to a swap out request.
   SwapOut(frame(), kProxyRoutingId, true, content::FrameReplicationState());
 
   // Check for a OnSwapOutACK.
   const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching(
       FrameHostMsg_SwapOut_ACK::ID);
   ASSERT_TRUE(msg);
   render_thread_->sink().ClearMessages();
 
   // It is possible to get a reload request at this point, containing the
   // params.page_state of the initial page (e.g., if the new page fails the
   // provisional load in the renderer process, after we unload the old page).
   // Ensure the old page gets reloaded, not swappedout://.
   CommonNavigationParams common_params;
   RequestNavigationParams request_params;
   common_params.url = GURL("data:text/html,<div>Page A</div>");
   common_params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
   common_params.transition = ui::PAGE_TRANSITION_RELOAD;
   request_params.current_history_list_length = 2;
   request_params.current_history_list_offset = 0;
   request_params.pending_history_list_offset = 0;
   request_params.page_id = 1;
+  request_params.nav_entry_id = 1;
   request_params.page_state = state_A;
   NavigateFrame(common_params, StartNavigationParams(), request_params);
   ProcessPendingMessages();
 
   // Verify page A committed, not swappedout://.
   const IPC::Message* frame_navigate_msg =
       render_thread_->sink().GetUniqueMessageMatching(
           FrameHostMsg_DidCommitProvisionalLoad::ID);
   EXPECT_TRUE(frame_navigate_msg);
 
@@ skipping 150 matching lines @@
   EXPECT_EQ(page_id_C, page_id);
   EXPECT_NE(state_A, state);
   EXPECT_NE(state_B, state);
   EXPECT_EQ(state_C, state);
 }
 
 // Test that stale back/forward navigations arriving from the browser are
 // ignored.  See http://crbug.com/86758.
 TEST_F(RenderViewImplTest, StaleNavigationsIgnored) {
   // Load page A.
-  LoadHTML("<div>Page A</div>");
+  LoadHTML("<div id=pagename>Page A</div>");
   EXPECT_EQ(1, view()->history_list_length_);
   EXPECT_EQ(0, view()->history_list_offset_);
 
   // Load page B, which will trigger an UpdateState message for page A.
-  LoadHTML("<div>Page B</div>");
+  LoadHTML("<div id=pagename>Page B</div>");
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(1, view()->history_list_offset_);
 
   // Check for a valid UpdateState message for page A.
   ProcessPendingMessages();
   const IPC::Message* msg_A = render_thread_->sink().GetUniqueMessageMatching(
       ViewHostMsg_UpdateState::ID);
   ASSERT_TRUE(msg_A);
   ViewHostMsg_UpdateState::Param param;
   ViewHostMsg_UpdateState::Read(msg_A, &param);
   int page_id_A = get<0>(param);
   PageState state_A = get<1>(param);
   EXPECT_EQ(1, page_id_A);
   render_thread_->sink().ClearMessages();
 
-  // Back to page A (page_id 1) and commit.
+  // Back to page A (nav_entry_id 1) and commit.
   CommonNavigationParams common_params_A;
   RequestNavigationParams request_params_A;
   common_params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params_A.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   request_params_A.current_history_list_length = 2;
   request_params_A.current_history_list_offset = 1;
   request_params_A.pending_history_list_offset = 0;
   request_params_A.page_id = 1;
+  request_params_A.nav_entry_id = 1;
   request_params_A.page_state = state_A;
   NavigateFrame(common_params_A, StartNavigationParams(), request_params_A);
   ProcessPendingMessages();
 
   // A new navigation commits, clearing the forward history.
-  LoadHTML("<div>Page C</div>");
+  LoadHTML("<div id=pagename>Page C</div>");
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(1, view()->history_list_offset_);
   EXPECT_EQ(3, view()->page_id_); // page C is now page id 3
+  int was_page_c = -1;
+  base::string16 check_page_c = base::ASCIIToUTF16(
+      "Number(document.getElementById('pagename').innerHTML == 'Page C')");

[Charlie Reis, 2015/04/22 05:27:25]

This pattern of returning a bool as an int makes me sad.  No need to change it
for this CL, which is doing enough already.  Afterward, we may want to move
TranslateHelper::ExecuteScriptAndGetBoolResult to a more general
ExecuteJavaScriptAndReturnBool utility that others can use.

[Avi (use Gerrit), 2015/04/22 18:31:51]

Acknowledged.

+  EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_c, &was_page_c));
+  EXPECT_EQ(1, was_page_c);
 
   // The browser then sends a stale navigation to B, which should be ignored.
   CommonNavigationParams common_params_B;
   RequestNavigationParams request_params_B;
   common_params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
   common_params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
   request_params_B.current_history_list_length = 2;
   request_params_B.current_history_list_offset = 0;
   request_params_B.pending_history_list_offset = 1;
   request_params_B.page_id = 2;
+  request_params_B.nav_entry_id = 2;
   request_params_B.page_state =
       state_A;  // Doesn't matter, just has to be present.
   NavigateFrame(common_params_B, StartNavigationParams(), request_params_B);
 
   // State should be unchanged.
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(1, view()->history_list_offset_);
   EXPECT_EQ(3, view()->page_id_); // page C, not page B
+  was_page_c = -1;
+  EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(check_page_c, &was_page_c));
+  EXPECT_EQ(1, was_page_c);
 
   // Check for a valid DidDropNavigation message.
   ProcessPendingMessages();
   const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching(
       FrameHostMsg_DidDropNavigation::ID);
   ASSERT_TRUE(msg);
   render_thread_->sink().ClearMessages();
 }
 
 // Test that our IME backend sends a notification message when the input focus
@@ skipping 1434 matching lines @@
   base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
       &DevToolsAgentTest::CloseWhilePaused, base::Unretained(this)));
   ExecuteJavaScript("debugger;");
 
   // CloseWhilePaused should resume execution and continue here.
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content