Merge 129306 - Prevent state updates for kSwappedOutURL.

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/shared_memory.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/intents_messages.h"
@@ skipping 42 matching lines @@
   // notification. We need to spin the message loop to catch this update.
   ExecuteJavaScript("document.getElementById('elt_text').value = 'foo';");
   ProcessPendingMessages();
   EXPECT_TRUE(render_thread_->sink().GetUniqueMessageMatching(
       ViewHostMsg_UpdateState::ID));
 }
 
 // Ensure the RenderViewImpl sends an ACK to a SwapOut request, even if it is
 // already swapped out.  http://crbug.com/93427.
 TEST_F(RenderViewImplTest, SendSwapOutACK) {
+  LoadHTML("<div>Page A</div>");
   int initial_page_id = view()->GetPageId();
 
   // Respond to a swap out request.
   ViewMsg_SwapOut_Params params;
   params.closing_process_id = 10;
   params.closing_route_id = 11;
   params.new_render_process_host_id = 12;
   params.new_request_id = 13;
   view()->OnSwapOut(params);
 
@@ skipping 12 matching lines @@
             reply_params.a.new_render_process_host_id);
   EXPECT_EQ(params.new_request_id, reply_params.a.new_request_id);
 
   // It is possible to get another swap out request.  Ensure that we send
   // an ACK, even if we don't have to do anything else.
   render_thread_->sink().ClearMessages();
   view()->OnSwapOut(params);
   const IPC::Message* msg2 = render_thread_->sink().GetUniqueMessageMatching(
       ViewHostMsg_SwapOut_ACK::ID);
   ASSERT_TRUE(msg2);
+
+  // If we navigate back to this RenderView, ensure we don't send a state
+  // update for the swapped out URL.  (http://crbug.com/72235)
+  ViewMsg_Navigate_Params nav_params;
+  nav_params.url = GURL("data:text/html,<div>Page B</div>");
+  nav_params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+  nav_params.transition = content::PAGE_TRANSITION_TYPED;
+  nav_params.current_history_list_length = 1;
+  nav_params.current_history_list_offset = 0;
+  nav_params.pending_history_list_offset = 1;
+  nav_params.page_id = -1;
+  view()->OnNavigate(nav_params);
+  ProcessPendingMessages();
+  const IPC::Message* msg3 = render_thread_->sink().GetUniqueMessageMatching(
+      ViewHostMsg_UpdateState::ID);
+  EXPECT_FALSE(msg3);
 }
 
 // Test that we get the correct UpdateState message when we go back twice
 // quickly without committing.  Regression test for http://crbug.com/58082.
 TEST_F(RenderViewImplTest, LastCommittedUpdateState) {
   // Load page A.
   LoadHTML("<div>Page A</div>");
 
   // Load page B, which will trigger an UpdateState message for page A.
   LoadHTML("<div>Page B</div>");
@@ skipping 1038 matching lines @@
   string16 type;
   string16 href;
   string16 title;
   string16 disposition;
   IntentsHostMsg_RegisterIntentService::Read(
       msg, &action, &type, &href, &title, &disposition);
   EXPECT_EQ(ASCIIToUTF16("a"), action);
   EXPECT_EQ(ASCIIToUTF16("t"), type);
   EXPECT_EQ(ASCIIToUTF16("title"), title);
 }