Eliminate SwapOut message parameters, keeping state in RVHM instead.

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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/view_messages.h"
@@ skipping 407 matching lines @@
   new_view->Release();
 }
 
 // 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);
+  view()->OnSwapOut();
 
   // Ensure the swap out commits synchronously.
   EXPECT_NE(initial_page_id, view()->GetPageId());
 
-  // Check for a valid OnSwapOutACK with echoed params.
+  // Check for a valid OnSwapOutACK.
   const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching(
       ViewHostMsg_SwapOut_ACK::ID);
   ASSERT_TRUE(msg);
-  ViewHostMsg_SwapOut_ACK::Param reply_params;
-  ViewHostMsg_SwapOut_ACK::Read(msg, &reply_params);
-  EXPECT_EQ(params.closing_process_id, reply_params.a.closing_process_id);
-  EXPECT_EQ(params.closing_route_id, reply_params.a.closing_route_id);
-  EXPECT_EQ(params.new_render_process_host_id,
-            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);
+  view()->OnSwapOut();
   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 = PAGE_TRANSITION_TYPED;
@@ skipping 34 matching lines @@
   params_A.transition = PAGE_TRANSITION_FORWARD_BACK;
   params_A.current_history_list_length = 2;
   params_A.current_history_list_offset = 1;
   params_A.pending_history_list_offset = 0;
   params_A.page_id = 1;
   params_A.page_state = state_A;
   view()->OnNavigate(params_A);
   ProcessPendingMessages();
 
   // 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);
+  view()->OnSwapOut();
 
   // Check for a OnSwapOutACK.
   const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching(
       ViewHostMsg_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).
@@ skipping 1337 matching lines @@
   EXPECT_EQ(output, L"hello \n\nworld");
 }
 
 // This test ensures that a RenderFrame object is created for the top level
 // frame in the RenderView.
 TEST_F(RenderViewImplTest, BasicRenderFrame) {
   EXPECT_TRUE(view()->main_render_frame_.get());
 }
 
 }  // namespace content