Add ref-count on RenderViewHost for each new RenderFrameProxyHost.

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 "content/browser/site_per_process_browsertest.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 441 matching lines @@
   // Load a cross-site page into both iframes.
   GURL foo_url = embedded_test_server()->GetURL("foo.com", "/title2.html");
   NavigateFrameToURL(root->child_at(0), foo_url);
   EXPECT_TRUE(observer.last_navigation_succeeded());
   EXPECT_EQ(foo_url, observer.last_navigation_url());
   NavigateFrameToURL(root->child_at(1), foo_url);
   EXPECT_TRUE(observer.last_navigation_succeeded());
   EXPECT_EQ(foo_url, observer.last_navigation_url());
 
   // Ensure that we have created a new process for the subframes.
-  ASSERT_EQ(2U, root->child_count());
-  EXPECT_NE(shell()->web_contents()->GetSiteInstance(),
-            root->child_at(0)->current_frame_host()->GetSiteInstance());
-  EXPECT_EQ(root->child_at(0)->current_frame_host()->GetSiteInstance(),
-            root->child_at(1)->current_frame_host()->GetSiteInstance());
+  EXPECT_EQ(
+      " Site A ------------ proxies for B\n"
+      "   |--Site B ------- proxies for A\n"
+      "   +--Site B ------- proxies for A\n"
+      "Where A = http://127.0.0.1/\n"
+      "      B = http://foo.com/",
+      DepictFrameTree(root));
+
+  int subframe_process_id = root->child_at(0)
+                                ->current_frame_host()
+                                ->GetSiteInstance()
+                                ->GetProcess()
+                                ->GetID();
+  int subframe_rvh_id = root->child_at(0)
+                            ->current_frame_host()
+                            ->render_view_host()
+                            ->GetRoutingID();
+  EXPECT_TRUE(RenderViewHost::FromID(subframe_process_id, subframe_rvh_id));
 
   // Use Javascript in the parent to remove one of the frames and ensure that
   // the subframe goes away.
   EXPECT_TRUE(ExecuteScript(shell()->web_contents(),
                             "document.body.removeChild("
                             "document.querySelectorAll('iframe')[0])"));
   ASSERT_EQ(1U, root->child_count());
 
   // Load a new same-site page in the top-level frame and ensure the other
   // subframe goes away.
   GURL new_url(embedded_test_server()->GetURL("/title1.html"));
   NavigateToURL(shell(), new_url);
   ASSERT_EQ(0U, root->child_count());
+
+  // Ensure the RVH for the subframe gets cleaned up when the frame goes away.
+  EXPECT_FALSE(RenderViewHost::FromID(subframe_process_id, subframe_rvh_id));
 }
 
 // Ensure that root frames cannot be detached.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, RestrictFrameDetach) {
   GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html"));
   NavigateToURL(shell(), main_url);
 
   // It is safe to obtain the root frame tree node here, as it doesn't change.
   FrameTreeNode* root =
       static_cast<WebContentsImpl*>(shell()->web_contents())->
@@ skipping 1969 matching lines @@
       "   |--Site A\n"
       "   +--Site A\n"
       "        |--Site A\n"
       "        +--Site A\n"
       "             +--Site A\n"
       "Where A = http://127.0.0.1/",
       DepictFrameTree(root));
 }
 
 }  // namespace content