Remove RenderFrameHostManager::MoveToPendingDeleteHosts

content/browser/frame_host/render_frame_host_manager.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 <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 633 matching lines @@
 
   // If the old RFH is not live, just return as there is no further work to do.
   // It will be deleted and there will be no proxy created.
   if (!old_render_frame_host->IsRenderFrameLive())
     return;
 
   // If there are no active frames besides this one, we can delete the old
   // RenderFrameHost once it runs its unload handler, without replacing it with
   // a proxy.
   if (old_render_frame_host->GetSiteInstance()->active_frame_count() <= 1) {
-    // Tell the old RenderFrameHost to swap out, with no proxy to replace it.
+    // Tell the old RenderFrameHost to swap out, with no proxy to replace it and
+    // put it on the pending deletion list. It will be deleted when its SwapOut
+    // ACK is received, or when the timer times out, or when the RFHM itself is
+    // deleted (whichever comes first).
     old_render_frame_host->SwapOut(nullptr, true);
-    MoveToPendingDeleteHosts(std::move(old_render_frame_host));
+    pending_delete_hosts_.push_back(std::move(old_render_frame_host));
     return;
   }
 
   // Otherwise there are active views and we need a proxy for the old RFH.
   // (There should not be one yet.)
   RenderFrameProxyHost* proxy =
       CreateRenderFrameProxyHost(old_render_frame_host->GetSiteInstance(),
                                  old_render_frame_host->render_view_host());
 
   // Tell the old RenderFrameHost to swap out and be replaced by the proxy.
   old_render_frame_host->SwapOut(proxy, true);
 
   // SwapOut creates a RenderFrameProxy, so set the proxy to be initialized.
   proxy->set_render_frame_proxy_created(true);
 
-  MoveToPendingDeleteHosts(std::move(old_render_frame_host));
+  // |old_render_frame_host| will be deleted when its SwapOut ACK is received,
+  // or when the timer times out, or when the RFHM itself is deleted (whichever
+  // comes first).
+  pending_delete_hosts_.push_back(std::move(old_render_frame_host));

[alexmos, 2016/04/18 20:48:05]

nit: instead of repeating the comment, I'm curious if we could just add an else
clause to the active_frame_count if statement, and push the proxy work there,
and then only do the pending_delete_hosts.push_back once, here.  I think it's
fine either way though.

[nasko, 2016/04/18 22:00:16]

Good idea! Done.

 }
 
 void RenderFrameHostManager::DiscardUnusedFrame(
     std::unique_ptr<RenderFrameHostImpl> render_frame_host) {
   // TODO(carlosk): this code is very similar to what can be found in
   // SwapOutOldFrame and we should see that these are unified at some point.
 
   // If the SiteInstance for the pending RFH is being used by others don't
   // delete the RFH. Just swap it out and it can be reused at a later point.
   // In --site-per-process, RenderFrameHosts are not kept around and are
@@ skipping 11 matching lines @@
     RenderFrameProxyHost* proxy = GetRenderFrameProxyHost(site_instance);
     if (!proxy) {
       proxy = CreateRenderFrameProxyHost(site_instance,
                                          render_frame_host->render_view_host());
     }
   }
 
   render_frame_host.reset();
 }
 
-void RenderFrameHostManager::MoveToPendingDeleteHosts(
-    std::unique_ptr<RenderFrameHostImpl> render_frame_host) {
-  // |render_frame_host| will be deleted when its SwapOut ACK is received, or
-  // when the timer times out, or when the RFHM itself is deleted (whichever
-  // comes first).
-  pending_delete_hosts_.push_back(std::move(render_frame_host));
-}
-
 bool RenderFrameHostManager::IsViewPendingDeletion(
     RenderViewHostImpl* render_view_host) {
   // Only safe to call this on the main frame.
   CHECK(frame_tree_node_->IsMainFrame());
 
   // The view is not pending deletion if more than one frame or proxy references
   // it.
   if (render_view_host->ref_count() > 1)
     return false;
 
@@ skipping 1859 matching lines @@
                                              resolved_url)) {
     DCHECK(!dest_instance ||
            dest_instance == render_frame_host_->GetSiteInstance());
     return false;
   }
 
   return true;
 }
 
 }  // namespace content