Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

content/browser/frame_host/frame_tree_unittest.cc

Index: content/browser/frame_host/frame_tree_unittest.cc
diff --git a/content/browser/frame_host/frame_tree_unittest.cc b/content/browser/frame_host/frame_tree_unittest.cc
index 6f1bb3303805386ad0aa7a5c112fa2960ca39b7d..5fc536602a669c829c4782670af3bc3fbbf43172 100644
--- a/content/browser/frame_host/frame_tree_unittest.cc
+++ b/content/browser/frame_host/frame_tree_unittest.cc
@@ -47,35 +47,6 @@ class FrameTreeTest : public RenderViewHostTestHarness {
   }
 };
 
-// The root node never changes during navigation even though its
-// RenderFrameHost does.
-//  - Swapping main frame doesn't change root node.
-//  - Swapping back to NULL doesn't crash (easier tear-down for interstitials).
-//  - Main frame does not own RenderFrameHost.
-TEST_F(FrameTreeTest, RootNode) {
-  FrameTree frame_tree(new NavigatorImpl(NULL, NULL), NULL, NULL, NULL, NULL);
-
-  // Initial state has empty node.
-  FrameTreeNode* root = frame_tree.root();
-  ASSERT_TRUE(root);
-  EXPECT_FALSE(frame_tree.GetMainFrame());
-
-  // Swap in main frame.
-  RenderFrameHostImpl* dummy = reinterpret_cast<RenderFrameHostImpl*>(0x1);
-  frame_tree.SwapMainFrame(dummy);
-  EXPECT_EQ(root, frame_tree.root());
-  EXPECT_EQ(dummy, frame_tree.GetMainFrame());
-
-  // Move back to NULL.
-  frame_tree.SwapMainFrame(NULL);
-  EXPECT_EQ(root, frame_tree.root());
-  EXPECT_FALSE(frame_tree.GetMainFrame());
-
-  // Move back to an invalid pointer, let the FrameTree go out of scope. Test
-  // should not crash because the main frame isn't owned.
-  frame_tree.SwapMainFrame(dummy);
-}
-
 // Test that swapping the main frame resets the renderer-assigned frame id.
 //  - On creation, frame id is unassigned.
 //  - After a swap, frame id is unassigned.
@@ -89,7 +60,7 @@ TEST_F(FrameTreeTest, FirstNavigationAfterSwap) {
   EXPECT_FALSE(frame_tree.IsFirstNavigationAfterSwap());
   EXPECT_EQ(1, frame_tree.root()->frame_id());
 
-  frame_tree.SwapMainFrame(NULL);
+  frame_tree.ResetForMainFrameSwap();
   EXPECT_TRUE(frame_tree.IsFirstNavigationAfterSwap());
   EXPECT_EQ(FrameTreeNode::kInvalidFrameId,
             frame_tree.root()->frame_id());
@@ -104,16 +75,6 @@ TEST_F(FrameTreeTest, Shape) {
   std::string no_children_node("no children node");
   std::string deep_subtree("node with deep subtree");
 
-  // Ensure the top-level node of the FrameTree is initialized by simulating a
-  // main frame swap here.
-  scoped_ptr<RenderFrameHostImpl> render_frame_host =
-      RenderFrameHostFactory::Create(static_cast<RenderViewHostImpl*>(rvh()),
-                                     NULL,
-                                     &frame_tree,
-                                     frame_tree.root(),
-                                     process()->GetNextRoutingID(),
-                                     false);
-  frame_tree.SwapMainFrame(render_frame_host.get());
   frame_tree.OnFirstNavigationAfterSwap(5);
 
   ASSERT_EQ("5: []", GetTreeState(&frame_tree));