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

Unified Diff: content/browser/renderer_host/render_view_host_unittest.cc

Issue 6319001: Support window.opener after a process swap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk. Created 9 years, 7 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
Index: content/browser/renderer_host/render_view_host_unittest.cc
diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc
index 26b8e39dd148148af71d7904cb0c5520982a514b..315cdbc672d2631047ca5c6f236039668d3a9aad 100644
--- a/content/browser/renderer_host/render_view_host_unittest.cc
+++ b/content/browser/renderer_host/render_view_host_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -48,10 +48,9 @@ TEST_F(RenderViewHostTest, ResetUnloadOnReload) {
NavigateAndCommit(url1);
controller().LoadURL(url2, GURL(), PageTransition::LINK);
// Simulate the ClosePage call which is normally sent by the net::URLRequest.
- rvh()->ClosePage(true, 0, 0);
- // Needed so that navigations are not suspended on the RVH. Normally handled
- // by way of ViewHostMsg_ShouldClose_ACK.
- contents()->render_manager()->ShouldClosePage(true, true);
+ rvh()->ClosePage();
+ // Needed so that navigations are not suspended on the RVH.
+ rvh()->SendShouldCloseACK(true);
contents()->Stop();
controller().Reload(false);
EXPECT_FALSE(rvh()->is_waiting_for_unload_ack());
« no previous file with comments | « content/browser/renderer_host/render_view_host_delegate.h ('k') | content/browser/renderer_host/render_widget_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698