Remove Is{RVH}OnSwappedOutList, now that swappedout:// is gone.

content/browser/frame_host/render_frame_host_manager_unittest.cc

 // Copyright 2013 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 "content/browser/frame_host/render_frame_host_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 1320 matching lines @@
   TestRenderViewHost* rvh2 = test_rvh();
   EXPECT_NE(site_instance1, rfh2->GetSiteInstance());
   EXPECT_TRUE(site_instance1->IsRelatedSiteInstance(rfh2->GetSiteInstance()));
 
   // Ensure rvh1 is placed on swapped out list of the current tab.
   EXPECT_TRUE(rfh1_deleted_observer.deleted());
   EXPECT_TRUE(manager->GetRenderFrameProxyHost(site_instance1.get()));
   EXPECT_EQ(rvh1,
             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 the other two copies of it
below.)

[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.
   contents()->NavigateAndCommit(kChromeUrl);
   TestRenderFrameHost* rfh3 = main_test_rfh();
   EXPECT_NE(site_instance1, rfh3->GetSiteInstance());
   EXPECT_FALSE(site_instance1->IsRelatedSiteInstance(rfh3->GetSiteInstance()));
 
   // No scripting is allowed across BrowsingInstances, so we should not create
   // swapped out RVHs for the opener chain in this case.
@@ skipping 221 matching lines @@
 
   // Navigate to a different WebUI URL (different SiteInstance, same
   // BrowsingInstance).
   contents()->NavigateAndCommit(kPluginUrl);
   TestRenderViewHost* rvh2 = test_rvh();
   EXPECT_NE(rvh1->GetSiteInstance(), rvh2->GetSiteInstance());
   EXPECT_TRUE(rvh1->GetSiteInstance()->IsRelatedSiteInstance(
                   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.
   EXPECT_TRUE(rvh2->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);
 }
 
 // Test that we reuse the same guest SiteInstance if we navigate across sites.
 TEST_F(RenderFrameHostManagerTest, NoSwapOnGuestNavigations) {
   GURL guest_url(std::string(kGuestScheme).append("://abc123"));
   scoped_refptr<SiteInstance> instance =
@@ skipping 1487 matching lines @@
   commit_params.should_enforce_strict_mixed_content_checking = false;
   child_host->SendNavigateWithParams(&commit_params);
   EXPECT_NO_FATAL_FAILURE(CheckMixedContentIPC(
       main_test_rfh(), false, proxy_to_parent->GetRoutingID()));
   EXPECT_FALSE(root->child_at(0)
                    ->current_replication_state()
                    .should_enforce_strict_mixed_content_checking);
 }
 
 }  // namespace content