chrome/browser/ui/browser_browsertest.cc - Issue 403833002: Revert of [DevTools] Move DevToolsWindow testing code to a separate class.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 403833002: Revert of [DevTools] Move DevToolsWindow testing code to a separate class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 months 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

« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest.cc ('k') | chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser_browsertest.cc

diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc

index 5686c58d30e58fefbd5aa1d10eb4618b2d5e540a..0585f14b8fcbf2d07b270c3f08f1e42f75a4fd70 100644

--- a/chrome/browser/ui/browser_browsertest.cc

+++ b/chrome/browser/ui/browser_browsertest.cc

@@ -18,7 +18,7 @@

#include "chrome/browser/command_updater.h"

#include "chrome/browser/content_settings/host_content_settings_map.h"

#include "chrome/browser/defaults.h"

-#include "chrome/browser/devtools/devtools_window_testing.h"

+#include "chrome/browser/devtools/devtools_window.h"

#include "chrome/browser/extensions/extension_browsertest.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/tab_helper.h"

@@ -1374,7 +1374,9 @@

NEW_WINDOW));

ASSERT_TRUE(app_window);

- DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false);

+ DevToolsWindow::OpenDevToolsWindowForTest(

+ browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),

+ false);

// The launch should have created a new app browser and a dev tools browser.

ASSERT_EQ(3u,