| Index: chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
|
| diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
|
| index d92ec09170c4c660adf2e8e406b9ac2d7fc470de..a7dd5bd48d7cfd52bce2d47ed49516d1c7d2725c 100644
|
| --- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
|
| +++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
|
| @@ -36,27 +36,17 @@ int RenderProcessHostCount() {
|
| }
|
|
|
| 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 (size_t i = 0; i < widgets.size(); ++i) {
|
| + if (!widgets[i]->GetProcess()->HasConnection())
|
| + continue;
|
| + if (!widgets[i]->IsRenderView())
|
| 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;
|
| - }
|
| + RenderViewHost* host = RenderViewHost::From(widgets[i]);
|
| + WebContents* contents = WebContents::FromRenderViewHost(host);
|
| + GURL url = contents->GetURL();
|
| + if (url.SchemeIs(chrome::kChromeDevToolsScheme))
|
| + return host;
|
| }
|
| return NULL;
|
| }
|
|
|