Revert "Destroy the old RenderWidgetHostView when swapping out a main frame."

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 0cf0be9004132d63cf90be31c05ffe3b573676a1..e3076d2727e3fccce10079773e43b606a916f869 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -5000,16 +5000,11 @@ bool WebContentsImpl::CreateRenderViewForRenderManager(
   TRACE_EVENT0("browser,navigation",
                "WebContentsImpl::CreateRenderViewForRenderManager");
 
-  RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(render_view_host);
-
-  // We only create a RWHV for active RenderViewHosts. When an inactive RVH is
-  // reused, the RWHV is created in RenderFrameHostManager::CommitPending.
-  if (rvhi->is_active()) {
-    DCHECK_EQ(MSG_ROUTING_NONE, proxy_routing_id);
+  if (proxy_routing_id == MSG_ROUTING_NONE)
     CreateRenderWidgetHostViewForRenderManager(render_view_host);
-  }
 
-  if (!rvhi->CreateRenderView(opener_frame_routing_id, proxy_routing_id,
+  if (!static_cast<RenderViewHostImpl*>(render_view_host)
+           ->CreateRenderView(opener_frame_routing_id, proxy_routing_id,
                               replicated_frame_state, created_with_opener_)) {
     return false;
   }