chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc - Issue 108213012: [DevTools] Remove dock side knowledge from browser.

Unified Diff: chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc

Issue 108213012: [DevTools] Remove dock side knowledge from browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/devtools/devtools_window.cc ('K') | « chrome/browser/extensions/api/app_window/app_window_api.cc ('k') | chrome/browser/task_manager/task_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8272939424f7f686737136367c50938c17f2927d..f699987cedbdedafd9b595f7d05f44a4947e12e0 100644

--- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc

+++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc

@@ -343,8 +343,11 @@ IN_PROC_BROWSER_TEST_F(ChromeRenderProcessHostTest,

EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());

EXPECT_EQ(host_count, RenderProcessHostCount());

- // DevTools start in docked mode (no new tab), in a separate process.

- chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Inspect());

+ // Start DevTools in docked mode (no new tab).

+ // It should be in a separate process.

+ DevToolsWindow* docked_devtools = DevToolsWindow::ToggleDevToolsWindow(

+ browser(), DevToolsToggleAction::Inspect());

+ docked_devtools->SetIsDockedAndShowImmediatelyForTest(true);

host_count++;

EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());

EXPECT_EQ(host_count, RenderProcessHostCount());

@@ -353,8 +356,7 @@ IN_PROC_BROWSER_TEST_F(ChromeRenderProcessHostTest,

DCHECK(devtools);

// DevTools start in a separate process.

- DevToolsWindow::ToggleDevToolsWindow(

- devtools, true, DevToolsToggleAction::Inspect());

+ DevToolsWindow::OpenDevToolsWindow(devtools, DevToolsToggleAction::Inspect());

host_count++;

EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());

EXPECT_EQ(host_count, RenderProcessHostCount());

@@ -391,8 +393,11 @@ IN_PROC_BROWSER_TEST_F(ChromeRenderProcessHostTest,

EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());

EXPECT_EQ(host_count, RenderProcessHostCount());

- // DevTools start in docked mode (no new tab), in a separate process.

- chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Inspect());

+ // Start DevTools in docked mode (no new tab).

+ // It should be in a separate process.

+ DevToolsWindow* docked_devtools = DevToolsWindow::ToggleDevToolsWindow(

+ browser(), DevToolsToggleAction::Inspect());

+ docked_devtools->SetIsDockedAndShowImmediatelyForTest(true);

host_count++;

EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());

EXPECT_EQ(host_count, RenderProcessHostCount());

@@ -401,8 +406,7 @@ IN_PROC_BROWSER_TEST_F(ChromeRenderProcessHostTest,

DCHECK(devtools);

// DevTools start in a separate process.

- DevToolsWindow::ToggleDevToolsWindow(

- devtools, true, DevToolsToggleAction::Inspect());

+ DevToolsWindow::OpenDevToolsWindow(devtools, DevToolsToggleAction::Inspect());

host_count++;

EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());

EXPECT_EQ(host_count, RenderProcessHostCount());