Refactor RenderProcessHost to use IPC::Listener instead of RenderWidgetHost

chrome/browser/renderer_host/render_process_host_chrome_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 "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 18 matching lines @@
   int count = 0;
   while (!hosts.IsAtEnd()) {
     if (hosts.GetCurrentValue()->HasConnection())
       count++;
     hosts.Advance();
   }
   return count;
 }
 
 RenderViewHost* FindFirstDevToolsHost() {
-  content::RenderProcessHost::iterator hosts =
-      content::RenderProcessHost::AllHostsIterator();
-  for (; !hosts.IsAtEnd(); hosts.Advance()) {
-    content::RenderProcessHost* render_process_host = hosts.GetCurrentValue();
-    DCHECK(render_process_host);
-    if (!render_process_host->HasConnection())
+  RenderWidgetHost::List widgets = RenderWidgetHost::GetRenderWidgetHosts();
+  for (RenderWidgetHost::List::const_iterator it = widgets.begin();

[jam, 2013/06/12 19:59:59]

ditto

[nasko, 2013/06/12 21:18:59]

Done.

+      it != widgets.end(); ++it) {
+    const RenderWidgetHost* widget = *it;
+    if (!widget->GetProcess()->HasConnection())
       continue;
-    content::RenderProcessHost::RenderWidgetHostsIterator iter(
-        render_process_host->GetRenderWidgetHostsIterator());
-    for (; !iter.IsAtEnd(); iter.Advance()) {
-      const RenderWidgetHost* widget = iter.GetCurrentValue();
-      DCHECK(widget);
-      if (!widget || !widget->IsRenderView())
-        continue;
-      RenderViewHost* host =
-          RenderViewHost::From(const_cast<RenderWidgetHost*>(widget));
-      WebContents* contents = WebContents::FromRenderViewHost(host);
-      GURL url = contents->GetURL();
-      if (url.SchemeIs(chrome::kChromeDevToolsScheme))
-        return host;
-    }
+    if (!widget->IsRenderView())
+      continue;
+    RenderViewHost* host =
+      RenderViewHost::From(const_cast<RenderWidgetHost*>(widget));
+    WebContents* contents = WebContents::FromRenderViewHost(host);
+    GURL url = contents->GetURL();
+    if (url.SchemeIs(chrome::kChromeDevToolsScheme))
+      return host;
   }
   return NULL;
 }
 
 }  // namespace
 
 class ChromeRenderProcessHostTest : public InProcessBrowserTest {
  public:
   ChromeRenderProcessHostTest() {}
 
@@ skipping 285 matching lines @@
   RenderViewHost* devtools = FindFirstDevToolsHost();
   DCHECK(devtools);
 
   // DevTools start in a separate process.
   DevToolsWindow::ToggleDevToolsWindow(
       devtools, true, DEVTOOLS_TOGGLE_ACTION_INSPECT);
   host_count++;
   EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());
   EXPECT_EQ(host_count, RenderProcessHostCount());
 }