Introduce RenderFrameProxyHost object and use it in RFHM.

content/browser/frame_host/render_frame_host_manager.h

Index: content/browser/frame_host/render_frame_host_manager.h
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index b06e2e32c7a15f5679847283df9140d510845231..65a0722754e948b3382739f0dfb612b91fddd148 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -30,6 +30,7 @@ class NavigationEntryImpl;
 class RenderFrameHostDelegate;
 class RenderFrameHostImpl;
 class RenderFrameHostManagerTest;
+class RenderFrameProxyHost;
 class RenderViewHost;
 class RenderViewHostImpl;
 class RenderWidgetHostDelegate;
@@ -270,7 +271,7 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
   // Returns the swapped out RenderViewHost or RenderFrameHost for the given
   // SiteInstance, if any.

[Charlie Reis, 2014/03/31 23:22:35]

Maybe add a TODO comment saying that GetSwappedOutRVH is deprecated in favor of
GetRenderFrameProxyHost?

[nasko, 2014/04/09 17:52:01]

Done.

   RenderViewHostImpl* GetSwappedOutRenderViewHost(SiteInstance* instance) const;
-  RenderFrameHostImpl* GetSwappedOutRenderFrameHost(
+  RenderFrameProxyHost* GetRenderFrameProxyHost(
       SiteInstance* instance) const;
 
   // Runs the unload handler in the current page, when we know that a pending
@@ -333,8 +334,8 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
 
   // Used with FrameTree::ForEach to erase inactive RenderFrameHosts from a

[Charlie Reis, 2014/03/31 23:22:35]

I imagine there's a bunch of comments we'll want to update to talk about proxies
instead of inactive/swapped out RenderFrameHosts.

[nasko, 2014/04/09 17:52:01]

Done.

   // FrameTreeNode's RenderFrameHostManager.
-  static bool ClearSwappedOutRFHsInSiteInstance(int32 site_instance_id,
-                                                FrameTreeNode* node);
+  static bool ClearProxiesInSiteInstance(int32 site_instance_id,
+                                         FrameTreeNode* node);
 
   // Returns whether this tab should transition to a new renderer for
   // cross-site URLs.  Enabled unless we see the --process-per-tab command line
@@ -367,11 +368,11 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
       bool force_browsing_instance_swap);
 
   // Creates a RenderFrameHost and corresponding RenderViewHost if necessary.
-  RenderFrameHostImpl* CreateRenderFrameHost(SiteInstance* instance,
-                                             int view_routing_id,
-                                             int frame_routing_id,
-                                             bool swapped_out,
-                                             bool hidden);
+  scoped_ptr<RenderFrameHostImpl> CreateRenderFrameHost(SiteInstance* instance,
+                                                        int view_routing_id,
+                                                        int frame_routing_id,
+                                                        bool swapped_out,
+                                                        bool hidden);
 
   // Sets up the necessary state for a new RenderViewHost with the given opener,
   // if necessary.  Returns early if the RenderViewHost has already been
@@ -449,8 +450,8 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
 
   // A map of site instance ID to swapped out RenderFrameHosts.  This may

[Charlie Reis, 2014/03/31 23:22:35]

to RenderFrameProxyHosts?

[nasko, 2014/04/09 17:52:01]

Done.

   // include pending_render_frame_host_ for navigations to existing entries.

[Charlie Reis, 2014/03/31 23:22:35]

Is this part still accurate?

[nasko, 2014/04/09 17:52:01]

Done.

-  typedef base::hash_map<int32, RenderFrameHostImpl*> RenderFrameHostMap;
-  RenderFrameHostMap swapped_out_hosts_;
+  typedef base::hash_map<int32, RenderFrameProxyHost*> RenderFrameHostMap;
+  RenderFrameHostMap proxy_hosts_;
 
   // A map of RenderFrameHosts pending shutdown.
   typedef base::hash_map<int32, linked_ptr<RenderFrameHostImpl> >