Switch RenderFrameHostManager to use RenderProcessHostObserver, remove NOTIFICATION_RENDERER_PROCES…

content/test/content_browser_test_utils_internal.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/test/content_browser_test_utils_internal.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 48 matching lines @@
   // of assigned names it's important to do this before trying to name the
   // proxies, which have a less well defined order.
   for (to_explore.push(root); !to_explore.empty();) {
     FrameTreeNode* node = to_explore.top();
     to_explore.pop();
     for (size_t i = node->child_count(); i-- != 0;) {
       to_explore.push(node->child_at(i));
     }
 
     RenderFrameHost* pending = node->render_manager()->pending_frame_host();
-    RenderFrameHost* spec =
-        node->render_manager()->speculative_render_frame_host_.get();
+    RenderFrameHost* spec = node->render_manager()->speculative_frame_host();
     if (pending)
       legend[GetName(pending->GetSiteInstance())] = pending->GetSiteInstance();
     if (spec)
       legend[GetName(spec->GetSiteInstance())] = spec->GetSiteInstance();
   }
 
   // Traversal 3: Assign names to the proxies and add them to |legend| too.
   // Typically, only openers should have their names assigned this way.
   for (to_explore.push(root); !to_explore.empty();) {
     FrameTreeNode* node = to_explore.top();
     to_explore.pop();
     for (size_t i = node->child_count(); i-- != 0;) {
       to_explore.push(node->child_at(i));
     }
 
     // Sort the proxies by SiteInstance ID to avoid hash_map ordering.
-    std::map<int, RenderFrameProxyHost*> sorted_proxy_hosts;
-    for (auto& proxy_pair : node->render_manager()->proxy_hosts_) {
-      sorted_proxy_hosts.insert(proxy_pair);
-    }
+    std::map<int, RenderFrameProxyHost*> sorted_proxy_hosts =
+        node->render_manager()->GetAllProxyHostsForTesting();
     for (auto& proxy_pair : sorted_proxy_hosts) {
       RenderFrameProxyHost* proxy = proxy_pair.second;
       legend[GetName(proxy->GetSiteInstance())] = proxy->GetSiteInstance();
     }
   }
 
   // Traversal 4: Now that all names are assigned, make a big loop to pretty-
   // print the tree. Each iteration produces exactly one line of format.
   std::string result;
   for (to_explore.push(root); !to_explore.empty();) {
@@ skipping 33 matching lines @@
     // Prefix one extra space of padding for two reasons. First, this helps the
     // diagram aligns nicely with the legend. Second, this makes it easier to
     // read the diffs that gtest spits out on EXPECT_EQ failure.
     line = " " + line;
 
     // Summarize the FrameTreeNode's state. Always show the site of the current
     // RenderFrameHost, and show any exceptional state of the node, like a
     // pending or speculative RenderFrameHost.
     RenderFrameHost* current = node->render_manager()->current_frame_host();
     RenderFrameHost* pending = node->render_manager()->pending_frame_host();
-    RenderFrameHost* spec =
-        node->render_manager()->speculative_render_frame_host_.get();
+    RenderFrameHost* spec = node->render_manager()->speculative_frame_host();
     base::StringAppendF(&line, "Site %s",
                         GetName(current->GetSiteInstance()).c_str());
     if (pending) {
       base::StringAppendF(&line, " (%s pending)",
                           GetName(pending->GetSiteInstance()).c_str());
     }
     if (spec) {
       base::StringAppendF(&line, " (%s speculative)",
                           GetName(spec->GetSiteInstance()).c_str());
     }
 
     // Show the SiteInstances of the RenderFrameProxyHosts of this node.
-    if (!node->render_manager()->proxy_hosts_.empty()) {
+    std::map<int, RenderFrameProxyHost*> sorted_proxy_host_map =
+        node->render_manager()->GetAllProxyHostsForTesting();
+    if (!sorted_proxy_host_map.empty()) {
       // Show a dashed line of variable length before the proxy list. Always at
       // least two dashes.
       line.append(" --");
 
       // To make proxy lists align vertically for the first three tree levels,
       // pad with dashes up to a first tab stop at column 19 (which works out to
       // text editor column 28 in the typical diagram fed to EXPECT_EQ as a
       // string literal). Lining the lists up vertically makes differences in
       // the proxy sets easier to spot visually. We choose not to use the
       // *actual* tree height here, because that would make the diagram's
       // appearance less stable as the tree's shape evolves.
       while (line.length() < 20) {
         line.append("-");
       }
       line.append(" proxies for");
 
       // Sort these alphabetically, to avoid hash_map ordering dependency.
       std::vector<std::string> sorted_proxy_hosts;
-      for (auto& proxy_pair : node->render_manager()->proxy_hosts_) {
+      for (auto& proxy_pair : sorted_proxy_host_map) {
         sorted_proxy_hosts.push_back(
             GetName(proxy_pair.second->GetSiteInstance()));
       }
       std::sort(sorted_proxy_hosts.begin(), sorted_proxy_hosts.end());
       for (std::string& proxy_name : sorted_proxy_hosts) {
         base::StringAppendF(&line, " %s", proxy_name.c_str());
       }
     }
     if (node != root)
       result.append("\n");
@@ skipping 46 matching lines @@
       &did_create_popup);
   if (!did_execute_script || !did_create_popup)
     return nullptr;
 
   Shell* new_shell = new_shell_observer.GetShell();
   WaitForLoadStop(new_shell->web_contents());
   return new_shell;
 }
 
 }  // namespace content