Start using RenderFrameProxyHost objects.

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 38f5d516800e80aadc446304624846890d74e219..d4190cd0c1b4fbabf746901e83ca3857bab93a42 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -28,6 +28,7 @@ class NavigationControllerImpl;
 class NavigationEntry;
 class NavigationEntryImpl;
 class RenderFrameHostDelegate;
+class RenderFrameHost;
 class RenderFrameHostImpl;
 class RenderFrameHostManagerTest;
 class RenderFrameProxyHost;
@@ -65,6 +66,9 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
         int opener_route_id,
         int proxy_routing_id,
         bool for_main_frame) = 0;
+    virtual bool CreateRenderFrameForRenderManager(
+        RenderFrameHost* render_frame_host,
+        int parent_routing_id) = 0;
     virtual void BeforeUnloadFiredFromRenderManager(
         bool proceed, const base::TimeTicks& proceed_time,
         bool* proceed_to_fire_unload) = 0;
@@ -247,8 +251,12 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
   int CreateRenderFrame(SiteInstance* instance,
                         int opener_route_id,
                         bool swapped_out,
+                        bool for_main_frame,
                         bool hidden);
 
+  // Helper method to create and initialize a RenderFrameProxyHost.
+  int CreateRenderFrameProxy(SiteInstance* instance, int opener_route_id);
+
   // Sets the passed passed interstitial as the currently showing interstitial.
   // |interstitial_page| should be non NULL (use the remove_interstitial_page
   // method to unset the interstitial) and no interstitial page should be set
@@ -298,10 +306,15 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
   // of WebContentsImpl.
   void ResetProxyHosts();
 
+  int GetRoutingIdForSiteInstance(SiteInstance* site_instance);
+
  private:
   friend class RenderFrameHostManagerTest;
   friend class TestWebContents;
 
+  FRIEND_TEST_ALL_PREFIXES(CrossProcessFrameTreeBrowserTest,
+                           VerifyProxyCreation);
+
   // Tracks information about a navigation while a cross-process transition is
   // in progress, in case we need to transfer it to a new RenderFrameHost.
   // When a request is being transferred, deleting the PendingNavigationParams,
@@ -401,6 +414,8 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
                       int proxy_routing_id,
                       bool for_main_frame);
 
+  bool InitRenderFrame(RenderFrameHost* render_frame_host);
+
   // Sets the pending RenderFrameHost/WebUI to be the active one. Note that this
   // doesn't require the pending render_frame_host_ pointer to be non-NULL,
   // since there could be Web UI switching as well. Call this for every commit.