Update check in KillingRendererClearsDescendantProxies test.

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 1013 matching lines @@
   EXPECT_EQ(shell()->web_contents()->GetSiteInstance(),
             root->child_at(1)->current_frame_host()->GetSiteInstance());
 
   ASSERT_EQ(1U, root->child_at(0)->child_count());
 
   // Make sure node4 points to the correct cross-site-page.
   FrameTreeNode* node4 = root->child_at(0)->child_at(0);
   GURL site_c_url(embedded_test_server()->GetURL("baz.com", "/title1.html"));
   EXPECT_EQ(site_c_url, node4->current_url());
 
-  // |site_instance_c| is expected to go away once we kill |child_process_b|
-  // below; refcount it to extend the lifetime.
+  // |site_instance_c|'s frames and proxies are expected to go away once we kill
+  // |child_process_b| below.
   scoped_refptr<SiteInstanceImpl> site_instance_c =
       node4->current_frame_host()->GetSiteInstance();
 
   // Initially proxies for both B and C will be present in the root.
   EXPECT_EQ(
       " Site A ------------ proxies for B C\n"
       "   |--Site B ------- proxies for A C\n"
       "   |    +--Site C -- proxies for A B\n"
       "   +--Site A ------- proxies for B C\n"
       "Where A = http://a.com/\n"
       "      B = http://bar.com/\n"
       "      C = http://baz.com/",
       DepictFrameTree(root));
+  EXPECT_GT(site_instance_c->active_frame_count(), 0U);
+  EXPECT_TRUE(
+      root->render_manager()->GetRenderFrameProxyHost(site_instance_c.get()));
+
   // Kill process B.
   RenderProcessHost* child_process_b =
       root->child_at(0)->current_frame_host()->GetProcess();
   RenderProcessHostWatcher crash_observer(
       child_process_b, RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
   child_process_b->Shutdown(0, false);
   crash_observer.Wait();
 
   // Make sure proxy C has gone from root.
   // Make sure proxy C has gone from node3 as well.
   // Make sure proxy B stays around in root and node3.
   EXPECT_EQ(
       " Site A ------------ proxies for B\n"
       "   |--Site B ------- proxies for A\n"
       "   +--Site A ------- proxies for B\n"
       "Where A = http://a.com/\n"
       "      B = http://bar.com/ (no process)",
       DepictFrameTree(root));
 
-  EXPECT_TRUE(site_instance_c->HasOneRef());
+  EXPECT_EQ(0U, site_instance_c->active_frame_count());
+  EXPECT_FALSE(
+      root->render_manager()->GetRenderFrameProxyHost(site_instance_c.get()));

[ncarter (slow), 2015/05/27 19:44:26]

This EXPECT (and the one on line 1050) is redundant to the DepictFrameTree
assertion (which would fail if the first line has a proxy for C). We can just
remove these.

 }
 
 // Crash a subframe and ensures its children are cleared from the FrameTree.
 // See http://crbug.com/338508.
 // TODO(creis): Disabled for flakiness; see http://crbug.com/405582.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DISABLED_CrashSubframe) {
   GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html"));
   NavigateToURL(shell(), main_url);
 
   StartFrameAtDataURL();
@@ skipping 1416 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