Chromium Code Reviews| 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..feb07abaaec11859c6a7dc66b0fd6be5ab942027 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,20 @@ 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 (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; |
| + if (!widget->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(const_cast<RenderWidgetHost*>(widget)); |
| + WebContents* contents = WebContents::FromRenderViewHost(host); |
| + GURL url = contents->GetURL(); |
| + if (url.SchemeIs(chrome::kChromeDevToolsScheme)) |
| + return host; |
| } |
| return NULL; |
| } |