Unify frame IDs with RenderFrameHost routing IDs.

content/browser/frame_host/frame_tree_browsertest.cc

 // Copyright 2014 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 "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ skipping 52 matching lines @@
 }
 
 // TODO(ajwong): Talk with nasko and merge this functionality with
 // FrameTreeShape.
 IN_PROC_BROWSER_TEST_F(FrameTreeBrowserTest, FrameTreeShape2) {
   ASSERT_TRUE(test_server()->Start());
   NavigateToURL(shell(),
                 test_server()->GetURL("files/frame_tree/top.html"));
 
   WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell()->web_contents());
-  RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
-      wc->GetRenderViewHost());
   FrameTreeNode* root = wc->GetFrameTree()->root();
 
-  // Check that the root node is properly created with the frame id of the
-  // initial navigation.
+  // Check that the root node is properly created.
   ASSERT_EQ(3UL, root->child_count());
   EXPECT_EQ(std::string(), root->frame_name());
-  EXPECT_EQ(rvh->main_frame_id(), root->frame_id());
 
   ASSERT_EQ(2UL, root->child_at(0)->child_count());
   EXPECT_STREQ("1-1-name", root->child_at(0)->frame_name().c_str());
 
   // Verify the deepest node exists and has the right name.
   ASSERT_EQ(2UL, root->child_at(2)->child_count());
   EXPECT_EQ(1UL, root->child_at(2)->child_at(1)->child_count());
   EXPECT_EQ(0UL, root->child_at(2)->child_at(1)->child_at(0)->child_count());
   EXPECT_STREQ("3-1-id",
       root->child_at(2)->child_at(1)->child_at(0)->frame_name().c_str());
 
   // Navigate to about:blank, which should leave only the root node of the frame
   // tree in the browser process.
   NavigateToURL(shell(), test_server()->GetURL("files/title1.html"));
 
   root = wc->GetFrameTree()->root();
   EXPECT_EQ(0UL, root->child_count());
   EXPECT_EQ(std::string(), root->frame_name());
-  EXPECT_EQ(rvh->main_frame_id(), root->frame_id());
 }
 
 // Test that we can navigate away if the previous renderer doesn't clean up its
 // child frames.
 IN_PROC_BROWSER_TEST_F(FrameTreeBrowserTest, FrameTreeAfterCrash) {
   ASSERT_TRUE(test_server()->Start());
   NavigateToURL(shell(),
                 test_server()->GetURL("files/frame_tree/top.html"));
 
   // Crash the renderer so that it doesn't send any FrameDetached messages.
   RenderProcessHostWatcher crash_observer(
       shell()->web_contents(),
       RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
   NavigateToURL(shell(), GURL(kChromeUICrashURL));
   crash_observer.Wait();
 
-  // The frame tree should be cleared, and the frame ID should be reset.
+  // The frame tree should be cleared.
   WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell()->web_contents());
-  RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
-      wc->GetRenderViewHost());
   FrameTreeNode* root = wc->GetFrameTree()->root();
   EXPECT_EQ(0UL, root->child_count());
-  EXPECT_EQ(FrameTreeNode::kInvalidFrameId, root->frame_id());
-  EXPECT_EQ(rvh->main_frame_id(), root->frame_id());
 
   // Navigate to a new URL.
-  NavigateToURL(shell(), test_server()->GetURL("files/title1.html"));
-
-  // The frame ID should now be set.
+  GURL url(test_server()->GetURL("files/title1.html"));
+  NavigateToURL(shell(), url);
   EXPECT_EQ(0UL, root->child_count());
-  EXPECT_NE(FrameTreeNode::kInvalidFrameId, root->frame_id());
-  EXPECT_EQ(rvh->main_frame_id(), root->frame_id());
+  EXPECT_EQ(url, root->current_url());
 }
 
 // Test that we can navigate away if the previous renderer doesn't clean up its
 // child frames.
 IN_PROC_BROWSER_TEST_F(FrameTreeBrowserTest, NavigateWithLeftoverFrames) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   GURL base_url = test_server()->GetURL("files/site_isolation/");
   GURL::Replacements replace_host;
@@ skipping 12 matching lines @@
   WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell()->web_contents());
   FrameTreeNode* root = wc->GetFrameTree()->root();
   ASSERT_EQ(3UL, root->child_count());
 
   // Navigate to a new URL.  We use LoadURL because NavigateToURL will try to
   // wait for the previous navigation to stop.
   TestNavigationObserver tab_observer(wc, 1);
   shell()->LoadURL(base_url.Resolve("blank.html"));
   tab_observer.Wait();
 
-  // The frame tree should now be cleared, and the frame ID should be valid.
+  // The frame tree should now be cleared.
   EXPECT_EQ(0UL, root->child_count());
-  EXPECT_NE(FrameTreeNode::kInvalidFrameId, root->frame_id());
 }
 
 }  // namespace content