Properly recreate swapped out RenderView.

content/browser/frame_host/render_frame_host_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 
 #include <list>
 #include <map>
 
@@ skipping 652 matching lines @@
   // PlzNavigate
   // Creates and initializes a speculative RenderFrameHost and/or WebUI for an
   // ongoing navigation. They might be destroyed and re-created later if the
   // navigation is redirected to a different SiteInstance.
   bool CreateSpeculativeRenderFrameHost(const GURL& url,
                                         SiteInstance* old_instance,
                                         SiteInstance* new_instance,
                                         int bindings);
 
   // Sets up the necessary state for a new RenderViewHost.  Creates a
-  // RenderFrameProxy in the target renderer process with the given
-  // |proxy_routing_id|, which is used to route IPC messages when in swapped
+  // RenderFrameProxy in the target renderer process with the given valid

[Charlie Reis, 2015/10/16 23:09:57]

This comment makes it sound like the proxy is required.  Can you clarify when it
should be real vs null?

[nasko, 2015/10/16 23:42:09]

Done.

+  // |proxy|, which is used to route IPC messages when in swapped
   // out state.  Returns early if the RenderViewHost has already been
   // initialized for another RenderFrameHost.
   bool InitRenderView(RenderViewHostImpl* render_view_host,
-                      int proxy_routing_id);
+                      RenderFrameProxyHost* proxy);
 
   // Initialization for RenderFrameHost uses the same sequence as InitRenderView
   // above.
   bool InitRenderFrame(RenderFrameHostImpl* 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.
   // If PlzNavigate is enabled the method will set the speculative (not pending)
   // RenderFrameHost to be the active one.
@@ skipping 139 matching lines @@
   bool should_reuse_web_ui_;
 
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_