Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1940)

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 15682009: Eliminate SwapOut message parameters, keeping state in RVHM instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to get Android build fix Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/test/mock_render_process_host.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index d964fbe0c30f4de431cd66889ee74427209f79dc..f412f72b400e86cb2a70ecdd828a4e053a5c4a3f 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -425,32 +425,20 @@ TEST_F(RenderViewImplTest, SendSwapOutACK) {
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);
@@ -505,12 +493,7 @@ TEST_F(RenderViewImplTest, ReloadWhileSwappedOut) {
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(
« no previous file with comments | « content/public/test/mock_render_process_host.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698