Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

content/browser/renderer_host/render_view_host_browsertest.cc

 // Copyright (c) 2012 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 "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
@@ skipping 74 matching lines @@
 }
 
 // This test ensures a RenderFrameHost object is created for the top level frame
 // in each RenderViewHost.
 IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BasicRenderFrameHost) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL test_url = embedded_test_server()->GetURL("/simple_page.html");
   NavigateToURL(shell(), test_url);
 
-  RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
-      shell()->web_contents()->GetRenderViewHost());
-  EXPECT_TRUE(rvh->main_render_frame_host());
+  FrameTreeNode* old_root = static_cast<WebContentsImpl*>(
+      shell()->web_contents())->GetFrameTree()->root();
+  EXPECT_TRUE(old_root->current_render_frame_host());
 
   ShellAddedObserver new_shell_observer;
   EXPECT_TRUE(ExecuteScript(shell()->web_contents(), "window.open();"));
   Shell* new_shell = new_shell_observer.GetShell();
-  RenderViewHostImpl* new_rvh = static_cast<RenderViewHostImpl*>(
-      new_shell->web_contents()->GetRenderViewHost());
+  FrameTreeNode* new_root = static_cast<WebContentsImpl*>(
+      new_shell->web_contents())->GetFrameTree()->root();
 
-  EXPECT_TRUE(new_rvh->main_render_frame_host());
-  EXPECT_NE(rvh->main_render_frame_host()->routing_id(),
-            new_rvh->main_render_frame_host()->routing_id());
+  EXPECT_TRUE(new_root->current_render_frame_host());
+  EXPECT_NE(old_root->current_render_frame_host()->routing_id(),
+            new_root->current_render_frame_host()->routing_id());
 }
 
 }  // namespace content