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

Unified Diff: content/browser/frame_host/render_frame_host_manager_unittest.cc

Issue 1981413002: Remove Is{RVH}OnSwappedOutList, now that swappedout:// is gone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/frame_host/render_frame_host_manager_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index e058562321803384620492f16726b474e1baad42..b91940575b53181a8c6334a6bbbb53b125a89923 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -1339,21 +1339,17 @@ TEST_F(RenderFrameHostManagerTest, CreateSwappedOutOpenerRFHs) {
manager->GetSwappedOutRenderViewHost(rvh1->GetSiteInstance()));
// Ensure a swapped out RFH and RFH is created in the first opener tab.
alexmos 2016/05/18 00:01:34 nit: update this comment while you're here? (also
Charlie Reis 2016/05/19 17:11:10 Done.
- RenderFrameProxyHost* opener1_proxy =
- opener1_manager->GetRenderFrameProxyHost(rfh2->GetSiteInstance());
- RenderFrameHostImpl* opener1_rfh = opener1_proxy->render_frame_host();
+ EXPECT_TRUE(
+ opener1_manager->GetRenderFrameProxyHost(rfh2->GetSiteInstance()));
TestRenderViewHost* opener1_rvh = static_cast<TestRenderViewHost*>(
opener1_manager->GetSwappedOutRenderViewHost(rvh2->GetSiteInstance()));
- EXPECT_FALSE(opener1_rfh);
EXPECT_FALSE(opener1_rvh->is_active());
// Ensure a swapped out RFH and RVH is created in the second opener tab.
- RenderFrameProxyHost* opener2_proxy =
- opener2_manager->GetRenderFrameProxyHost(rfh2->GetSiteInstance());
- RenderFrameHostImpl* opener2_rfh = opener2_proxy->render_frame_host();
+ EXPECT_TRUE(
+ opener2_manager->GetRenderFrameProxyHost(rfh2->GetSiteInstance()));
TestRenderViewHost* opener2_rvh = static_cast<TestRenderViewHost*>(
opener2_manager->GetSwappedOutRenderViewHost(rvh2->GetSiteInstance()));
- EXPECT_FALSE(opener2_rfh);
EXPECT_FALSE(opener2_rvh->is_active());
// Navigate to a cross-BrowsingInstance URL.
@@ -1595,12 +1591,10 @@ TEST_F(RenderFrameHostManagerTest, EnableWebUIWithSwappedOutOpener) {
rvh2->GetSiteInstance()));
// Ensure a swapped out RFH and RVH is created in the first opener tab.
- RenderFrameProxyHost* opener1_proxy =
- opener1_manager->GetRenderFrameProxyHost(rvh2->GetSiteInstance());
- RenderFrameHostImpl* opener1_rfh = opener1_proxy->render_frame_host();
+ EXPECT_TRUE(
+ opener1_manager->GetRenderFrameProxyHost(rvh2->GetSiteInstance()));
TestRenderViewHost* opener1_rvh = static_cast<TestRenderViewHost*>(
opener1_manager->GetSwappedOutRenderViewHost(rvh2->GetSiteInstance()));
- EXPECT_FALSE(opener1_rfh);
EXPECT_FALSE(opener1_rvh->is_active());
// Ensure the new RVH has WebUI bindings.
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/frame_host/render_frame_proxy_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698