From 1ffb1c808855bfc51b726d6a1a4b15fd585845af Mon Sep 17 00:00:00 2001 From: "dgozman@chromium.org" Date: Fri, 18 Jul 2014 10:38:21 +0000 Subject: [DevTools] Move DevToolsWindow testing code to a separate class. This change: - allows for proper docking testing (including toolbox); - removes all test friends from DevToolsWindow; - unifies testing approach to use load callback instead of notifications; - adds simple toolbox tests. BUG=393566 Review URL: https://codereview.chromium.org/395783002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284050 0039d316-1c4b-4281-b951-d872f2087c98 --- .../task_manager/task_manager_browsertest.cc | 35 +++++++++++----------- 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'chrome/browser/task_manager/task_manager_browsertest.cc') diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 78043a0..8275879 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -8,7 +8,7 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/devtools/devtools_window.h" +#include "chrome/browser/devtools/devtools_window_testing.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/infobars/infobar_service.h" @@ -731,38 +731,37 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewDockedWindow) { ShowTaskManager(); // Task manager shown BEFORE dev tools window. ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); - DevToolsWindow::OpenDevToolsWindowForTest( - browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), - true); + DevToolsWindow* devtools = + DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); + DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); } IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewUndockedWindow) { ShowTaskManager(); // Task manager shown BEFORE dev tools window. ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); - DevToolsWindow::OpenDevToolsWindowForTest( - browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), - false); - ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); - ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); + DevToolsWindow* devtools = + DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); + ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); + ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); + DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); } IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldDockedWindow) { - DevToolsWindow::OpenDevToolsWindowForTest( - browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), - true); - + DevToolsWindow* devtools = + DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); ShowTaskManager(); // Task manager shown AFTER dev tools window. ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); + DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); } IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldUnockedWindow) { - DevToolsWindow::OpenDevToolsWindowForTest( - browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), - false); + DevToolsWindow* devtools = + DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); ShowTaskManager(); // Task manager shown AFTER dev tools window. - ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); - ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); + ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); + ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); + DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); } -- cgit v1.1