Refactor RenderProcessHost to use IPC::Listener instead of RenderWidgetHost

content/browser/devtools/render_view_devtools_agent_host.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/devtools/render_view_devtools_agent_host.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/devtools_manager_impl.h"
@@ skipping 102 matching lines @@
     if (cookie == (*it)->GetId()) {
       (*it)->ConnectRenderViewHost(rvh, true);
       break;
     }
   }
 }
 
 //static
 std::vector<RenderViewHost*> DevToolsAgentHost::GetValidRenderViewHosts() {
   std::vector<RenderViewHost*> result;
-  for (RenderProcessHost::iterator it(RenderProcessHost::AllHostsIterator());
-       !it.IsAtEnd(); it.Advance()) {
-    RenderProcessHost* render_process_host = it.GetCurrentValue();
-    DCHECK(render_process_host);
+  RenderWidgetHost::List widgets = RenderWidgetHost::GetRenderWidgetHosts();
+  for (RenderWidgetHost::List::const_iterator it = widgets.begin();
+      it != widgets.end(); ++it) {

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

ditto

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

Done.

+    const RenderWidgetHost* widget = *it;
 
     // Ignore processes that don't have a connection, such as crashed contents.
-    if (!render_process_host->HasConnection())
+    if (!widget->GetProcess()->HasConnection())
       continue;
 
-    RenderProcessHost::RenderWidgetHostsIterator rwit(
-        render_process_host->GetRenderWidgetHostsIterator());
-    for (; !rwit.IsAtEnd(); rwit.Advance()) {
-      const RenderWidgetHost* widget = rwit.GetCurrentValue();
-      DCHECK(widget);
-      if (!widget || !widget->IsRenderView())
-        continue;
+    if (!widget->IsRenderView())
+      continue;
 
-      RenderViewHost* rvh =
-          RenderViewHost::From(const_cast<RenderWidgetHost*>(widget));
-      // Don't report swapped out views.
-      if (static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out())
-        continue;
+    RenderViewHost* rvh =
+        RenderViewHost::From(const_cast<RenderWidgetHost*>(widget));
+    // Don't report swapped out views.
+    if (static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out())
+      continue;
 
-      WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
-      // Don't report a RenderViewHost if it is not the current RenderViewHost
-      // for some WebContents.
-      if (!web_contents || rvh != web_contents->GetRenderViewHost())
-        continue;
+    WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
+    // Don't report a RenderViewHost if it is not the current RenderViewHost
+    // for some WebContents.
+    if (!web_contents || rvh != web_contents->GetRenderViewHost())
+      continue;
 
-      result.push_back(rvh);
-    }
+    result.push_back(rvh);
   }
   return result;
 }
 
 // static
 void RenderViewDevToolsAgentHost::OnCancelPendingNavigation(
     RenderViewHost* pending,
     RenderViewHost* current) {
   std::string cookie = DevToolsAgentHost::DisconnectRenderViewHost(pending);
   if (cookie != std::string())
@@ skipping 169 matching lines @@
   if (render_view_host_)
     GetContentClient()->browser()->ClearCache(render_view_host_);
 }
 
 void RenderViewDevToolsAgentHost::OnClearBrowserCookies() {
   if (render_view_host_)
     GetContentClient()->browser()->ClearCookies(render_view_host_);
 }
 
 }  // namespace content