Avoid stale navigation requests without excessive page id knowledge in the renderer process.

content/test/test_web_contents.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/test/test_web_contents.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "content/browser/browser_url_handler_impl.h"
@@ skipping 15 matching lines @@
 #include "content/test/browser_side_navigation_test_utils.h"
 #include "content/test/test_navigation_url_loader.h"
 #include "content/test/test_render_view_host.h"
 #include "ui/base/page_transition_types.h"
 
 namespace content {
 
 TestWebContents::TestWebContents(BrowserContext* browser_context)
     : WebContentsImpl(browser_context, NULL),
       delegate_view_override_(NULL),
-      expect_set_history_length_and_prune_(false),
-      expect_set_history_length_and_prune_site_instance_(NULL),
-      expect_set_history_length_and_prune_history_length_(0),
-      expect_set_history_length_and_prune_min_page_id_(-1) {
+      expect_set_history_offset_and_length_(false),
+      expect_set_history_offset_and_length_history_length_(0) {
 }
 
 TestWebContents* TestWebContents::Create(BrowserContext* browser_context,
                                          SiteInstance* instance) {
   TestWebContents* test_web_contents = new TestWebContents(browser_context);
   test_web_contents->Init(WebContents::CreateParams(browser_context, instance));
   return test_web_contents;
 }
 
 TestWebContents::~TestWebContents() {
-  EXPECT_FALSE(expect_set_history_length_and_prune_);
+  EXPECT_FALSE(expect_set_history_offset_and_length_);
 }
 
 TestRenderFrameHost* TestWebContents::GetMainFrame() {
   return static_cast<TestRenderFrameHost*>(WebContentsImpl::GetMainFrame());
 }
 
 TestRenderViewHost* TestWebContents::GetRenderViewHost() const {
     return static_cast<TestRenderViewHost*>(
         WebContentsImpl::GetRenderViewHost());
 }
@@ skipping 149 matching lines @@
   opener_ = opener;
   AddDestructionObserver(opener_);
 }
 
 void TestWebContents::AddPendingContents(TestWebContents* contents) {
   // This is normally only done in WebContentsImpl::CreateNewWindow.
   pending_contents_[contents->GetRenderViewHost()->GetRoutingID()] = contents;
   AddDestructionObserver(contents);
 }
 
-void TestWebContents::ExpectSetHistoryLengthAndPrune(
-    const SiteInstance* site_instance,
-    int history_length,
-    int32 min_page_id) {
-  expect_set_history_length_and_prune_ = true;
-  expect_set_history_length_and_prune_site_instance_ =
-      static_cast<const SiteInstanceImpl*>(site_instance);
-  expect_set_history_length_and_prune_history_length_ = history_length;
-  expect_set_history_length_and_prune_min_page_id_ = min_page_id;
+void TestWebContents::ExpectSetHistoryOffsetAndLength(int history_offset,
+                                                      int history_length) {
+  expect_set_history_offset_and_length_ = true;
+  expect_set_history_offset_and_length_history_offset_ = history_offset;
+  expect_set_history_offset_and_length_history_length_ = history_length;
 }
 
-void TestWebContents::SetHistoryLengthAndPrune(
-    const SiteInstance* site_instance, int history_length,
-    int32 min_page_id) {
-  EXPECT_TRUE(expect_set_history_length_and_prune_);
-  expect_set_history_length_and_prune_ = false;
-  EXPECT_EQ(expect_set_history_length_and_prune_site_instance_.get(),
-            site_instance);
-  EXPECT_EQ(expect_set_history_length_and_prune_history_length_,
+void TestWebContents::SetHistoryOffsetAndLength(int history_offset,
+                                                int history_length) {
+  EXPECT_TRUE(expect_set_history_offset_and_length_);
+  expect_set_history_offset_and_length_ = false;
+  EXPECT_EQ(expect_set_history_offset_and_length_history_offset_,
+            history_offset);
+  EXPECT_EQ(expect_set_history_offset_and_length_history_length_,
             history_length);
-  EXPECT_EQ(expect_set_history_length_and_prune_min_page_id_, min_page_id);
 }
 
 void TestWebContents::TestDidFinishLoad(const GURL& url) {
   FrameHostMsg_DidFinishLoad msg(0, url);
   frame_tree_.root()->current_frame_host()->OnMessageReceived(msg);
 }
 
 void TestWebContents::TestDidFailLoadWithError(
     const GURL& url,
     int error_code,
@@ skipping 27 matching lines @@
 }
 
 void TestWebContents::ShowCreatedWidget(int route_id,
                                         const gfx::Rect& initial_pos) {
 }
 
 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
 }
 
 }  // namespace content