Unify frame IDs with RenderFrameHost routing IDs.

content/browser/site_per_process_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/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 465 matching lines @@
   replace_host.SetHostStr(foo_com);
   cross_site_url = cross_site_url.ReplaceComponents(replace_host);
   EXPECT_TRUE(NavigateIframeToURL(shell(), cross_site_url, "test"));
 
   // Check the subframe process.
   FrameTreeNode* root =
       static_cast<WebContentsImpl*>(shell()->web_contents())->
           GetFrameTree()->root();
   ASSERT_EQ(1U, root->child_count());
   FrameTreeNode* child = root->child_at(0);
-  EXPECT_NE(FrameTreeNode::kInvalidFrameId, root->frame_id());
-  EXPECT_NE(FrameTreeNode::kInvalidFrameId, root->child_at(0)->frame_id());
+  EXPECT_EQ(main_url, root->current_url());
+  EXPECT_EQ(cross_site_url, child->current_url());
 
   // Crash the subframe process.
   RenderProcessHost* root_process = root->current_frame_host()->GetProcess();
   RenderProcessHost* child_process = child->current_frame_host()->GetProcess();
   {
     RenderProcessHostWatcher crash_observer(
         child_process,
         RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
     base::KillProcess(child_process->GetHandle(), 0, false);
     crash_observer.Wait();
   }
 
   // Ensure that the child frame still exists but has been cleared.
+  // TODO(creis): Can we check something else, like the URL?

[awong, 2014/02/20 00:25:30]

This is confusing since the code below is actually checking a url...

[Charlie Reis, 2014/02/20 00:43:53]

Oops!  I was fixing my own TODO from patch set 1 and forgot to remove the TODO.

   EXPECT_EQ(1U, root->child_count());
-  EXPECT_EQ(FrameTreeNode::kInvalidFrameId, root->child_at(0)->frame_id());
+  EXPECT_EQ(main_url, root->current_url());
+  EXPECT_EQ(GURL(), child->current_url());
 
   // Now crash the top-level page to clear the child frame.
   {
     RenderProcessHostWatcher crash_observer(
         root_process,
         RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
     base::KillProcess(root_process->GetHandle(), 0, false);
     crash_observer.Wait();
   }
   EXPECT_EQ(0U, root->child_count());
-  EXPECT_EQ(FrameTreeNode::kInvalidFrameId, root->frame_id());
+  EXPECT_EQ(GURL(), root->current_url());
 }
 
 // TODO(nasko): Disable this test until out-of-process iframes is ready and the
 // security checks are back in place.
 // TODO(creis): Replace SpawnedTestServer with host_resolver to get test to run
 // on Android (http://crbug.com/187570).
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
                        DISABLED_CrossSiteIframeRedirectOnce) {
   ASSERT_TRUE(test_server()->Start());
   net::SpawnedTestServer https_server(
@@ skipping 410 matching lines @@
   EXPECT_EQ(0, controller.GetCurrentEntryIndex());
   EXPECT_EQ(url1, controller.GetEntryAtIndex(0)->GetURL());
 
   // Make sure the request for url2 did not complete.
   EXPECT_FALSE(tracking_delegate().WaitForTrackedURLAndGetCompleted());
 
   shell()->web_contents()->SetDelegate(old_delegate);
 }
 
 }  // namespace content