Refactor RenderProcessHost to use IPC::Listener instead of RenderWidgetHost

content/browser/accessibility/accessibility_ui.cc

 // Copyright (c) 2013 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/accessibility/accessibility_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 76 matching lines @@
                                favicon_url,
                                rvh->GetProcess()->GetID(),
                                rvh->GetRoutingID(),
                                accessibility_mode);
 }
 
 void SendTargetsData(
     const WebUIDataSource::GotDataCallback& callback) {
   scoped_ptr<ListValue> rvh_list(new ListValue());
 
-  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 tabs.
-    if (!render_process_host->HasConnection())
+    if (!widget->GetProcess()->HasConnection())
       continue;
 
-    RenderProcessHost::RenderWidgetHostsIterator rwh_it(
-        render_process_host->GetRenderWidgetHostsIterator());
-    for (; !rwh_it.IsAtEnd(); rwh_it.Advance()) {
-      const RenderWidgetHost* rwh = rwh_it.GetCurrentValue();
-      DCHECK(rwh);
-      if (!rwh || !rwh->IsRenderView())
+    if (!widget->IsRenderView())
         continue;
 
-      RenderViewHost* rvh =
-          RenderViewHost::From(const_cast<RenderWidgetHost*>(rwh));
+    RenderViewHost* rvh =
+        RenderViewHost::From(const_cast<RenderWidgetHost*>(widget));
 
-      rvh_list->Append(BuildTargetDescriptor(rvh));
-    }
+    rvh_list->Append(BuildTargetDescriptor(rvh));
   }
 
   scoped_ptr<DictionaryValue> data(new DictionaryValue());
   data->Set("list", rvh_list.release());
   scoped_ptr<FundamentalValue> a11y_mode(new FundamentalValue(
       BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()));
   data->Set("global_a11y_mode", a11y_mode.release());
 
   std::string json_string;
   base::JSONWriter::Write(data.get(), &json_string);
@@ skipping 128 matching lines @@
       AccessibilityTreeFormatter::Filter::ALLOW));
   formatter->SetFilters(filters);
   formatter->FormatAccessibilityTree(&accessibility_contents_utf16);
 
   result->Set("tree",
               new StringValue(UTF16ToUTF8(accessibility_contents_utf16)));
   web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get()));
 }
 
 }  // namespace content