OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "chrome/browser/devtools/devtools_window.h" | 6 #include "chrome/browser/devtools/devtools_window.h" |
7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
8 #include "chrome/browser/ui/browser_commands.h" | 8 #include "chrome/browser/ui/browser_commands.h" |
9 #include "chrome/browser/ui/singleton_tabs.h" | 9 #include "chrome/browser/ui/singleton_tabs.h" |
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 int count = 0; | 29 int count = 0; |
30 while (!hosts.IsAtEnd()) { | 30 while (!hosts.IsAtEnd()) { |
31 if (hosts.GetCurrentValue()->HasConnection()) | 31 if (hosts.GetCurrentValue()->HasConnection()) |
32 count++; | 32 count++; |
33 hosts.Advance(); | 33 hosts.Advance(); |
34 } | 34 } |
35 return count; | 35 return count; |
36 } | 36 } |
37 | 37 |
38 RenderViewHost* FindFirstDevToolsHost() { | 38 RenderViewHost* FindFirstDevToolsHost() { |
39 content::RenderProcessHost::iterator hosts = | 39 RenderWidgetHost::List widgets = RenderWidgetHost::GetRenderWidgetHosts(); |
40 content::RenderProcessHost::AllHostsIterator(); | 40 for (size_t i = 0; i < widgets.size(); ++i) { |
41 for (; !hosts.IsAtEnd(); hosts.Advance()) { | 41 if (!widgets[i]->GetProcess()->HasConnection()) |
42 content::RenderProcessHost* render_process_host = hosts.GetCurrentValue(); | |
43 DCHECK(render_process_host); | |
44 if (!render_process_host->HasConnection()) | |
45 continue; | 42 continue; |
46 content::RenderProcessHost::RenderWidgetHostsIterator iter( | 43 if (!widgets[i]->IsRenderView()) |
47 render_process_host->GetRenderWidgetHostsIterator()); | 44 continue; |
48 for (; !iter.IsAtEnd(); iter.Advance()) { | 45 RenderViewHost* host = RenderViewHost::From(widgets[i]); |
49 const RenderWidgetHost* widget = iter.GetCurrentValue(); | 46 WebContents* contents = WebContents::FromRenderViewHost(host); |
50 DCHECK(widget); | 47 GURL url = contents->GetURL(); |
51 if (!widget || !widget->IsRenderView()) | 48 if (url.SchemeIs(chrome::kChromeDevToolsScheme)) |
52 continue; | 49 return host; |
53 RenderViewHost* host = | |
54 RenderViewHost::From(const_cast<RenderWidgetHost*>(widget)); | |
55 WebContents* contents = WebContents::FromRenderViewHost(host); | |
56 GURL url = contents->GetURL(); | |
57 if (url.SchemeIs(chrome::kChromeDevToolsScheme)) | |
58 return host; | |
59 } | |
60 } | 50 } |
61 return NULL; | 51 return NULL; |
62 } | 52 } |
63 | 53 |
64 } // namespace | 54 } // namespace |
65 | 55 |
66 class ChromeRenderProcessHostTest : public InProcessBrowserTest { | 56 class ChromeRenderProcessHostTest : public InProcessBrowserTest { |
67 public: | 57 public: |
68 ChromeRenderProcessHostTest() {} | 58 ChromeRenderProcessHostTest() {} |
69 | 59 |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 RenderViewHost* devtools = FindFirstDevToolsHost(); | 345 RenderViewHost* devtools = FindFirstDevToolsHost(); |
356 DCHECK(devtools); | 346 DCHECK(devtools); |
357 | 347 |
358 // DevTools start in a separate process. | 348 // DevTools start in a separate process. |
359 DevToolsWindow::ToggleDevToolsWindow( | 349 DevToolsWindow::ToggleDevToolsWindow( |
360 devtools, true, DEVTOOLS_TOGGLE_ACTION_INSPECT); | 350 devtools, true, DEVTOOLS_TOGGLE_ACTION_INSPECT); |
361 host_count++; | 351 host_count++; |
362 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count()); | 352 EXPECT_EQ(tab_count, browser()->tab_strip_model()->count()); |
363 EXPECT_EQ(host_count, RenderProcessHostCount()); | 353 EXPECT_EQ(host_count, RenderProcessHostCount()); |
364 } | 354 } |
OLD | NEW |