Remove RFHM::IsPendingDeletion

content/browser/frame_host/render_frame_host_manager_browsertest.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 <stddef.h>
 #include <stdint.h>
 
 #include <set>
 
 #include "base/command_line.h"
@@ skipping 2379 matching lines @@
   TestFrameNavigationObserver commit_observer(root);
   shell()->LoadURL(embedded_test_server()->GetURL("b.com", "/title2.html"));
   commit_observer.WaitForCommit();
   rfh_a->ResetSwapOutTimerForTesting();
   EXPECT_NE(shell()->web_contents()->GetSiteInstance(),
             new_shell->web_contents()->GetSiteInstance());
   EXPECT_TRUE(root->render_manager()->GetRenderFrameProxyHost(site_instance_a));
 
   // The previous RFH should still be pending deletion, as we wait for either
   // the SwapOut ACK or a timeout.
-  ASSERT_TRUE(root->render_manager()->IsPendingDeletion(rfh_a));
+  ASSERT_TRUE(rfh_a->IsRenderFrameLive());
+  ASSERT_TRUE(!rfh_a->IsRFHStateActive(rfh_a->rfh_state()));

[alexmos, 2016/04/06 00:26:33]

nit: ASSERT_FALSE might be a bit more readable, here and below.

 
   // The corresponding RVH should not be pending deletion due to the proxy.
   EXPECT_FALSE(root->render_manager()->IsViewPendingDeletion(
                   rfh_a->render_view_host()));
 
   // Kill the old process.
   RenderProcessHost* process = rfh_a->GetProcess();
   RenderProcessHostWatcher crash_observer(
       process, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
   process->Shutdown(0, false);
@@ skipping 36 matching lines @@
   RenderFrameHostImpl* rfh_a = root->current_frame_host();
   SiteInstanceImpl* site_instance_a = rfh_a->GetSiteInstance();
   TestFrameNavigationObserver commit_observer(root);
   shell()->LoadURL(embedded_test_server()->GetURL("b.com", "/title2.html"));
   commit_observer.WaitForCommit();
   rfh_a->ResetSwapOutTimerForTesting();
   EXPECT_NE(site_instance_a, shell()->web_contents()->GetSiteInstance());
 
   // The previous RFH and RVH should still be pending deletion, as we wait for
   // either the SwapOut ACK or a timeout.
-  ASSERT_TRUE(root->render_manager()->IsPendingDeletion(rfh_a));
+  ASSERT_TRUE(rfh_a->IsRenderFrameLive());
+  ASSERT_TRUE(!rfh_a->IsRFHStateActive(rfh_a->rfh_state()));
   EXPECT_TRUE(root->render_manager()->IsViewPendingDeletion(
                   rfh_a->render_view_host()));
 
   // Open a popup in the new B process.
   Shell* new_shell =
       OpenPopup(shell()->web_contents(), GURL(url::kAboutBlankURL), "foo");
   EXPECT_EQ(shell()->web_contents()->GetSiteInstance(),
             new_shell->web_contents()->GetSiteInstance());
 
   // Navigate the popup to the original site, but don't wait for commit (which
@@ skipping 74 matching lines @@
         web_contents->GetRenderManagerForTesting()->speculative_frame_host());
   } else {
     EXPECT_FALSE(
         web_contents->GetRenderManagerForTesting()->pending_frame_host());
   }
 
   ResourceDispatcherHost::Get()->SetDelegate(nullptr);
 }
 
 }  // namespace content