chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm - 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/cocoa/dev_tools_controller_browsertest.mm

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/ui/cocoa/browser_window_controller_browsertest.mm ('k') | chrome/browser/ui/cocoa/view_id_util_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm

diff --git a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm

index 516a7e74c29264007d55ec899638007ddc83c549..e22f829e675b969709127b3a7162bf3a4da1c0d0 100644

--- a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm

+++ b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm

@@ -5,7 +5,6 @@

#import "chrome/browser/ui/cocoa/dev_tools_controller.h"

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

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

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/browser_window.h"

@@ -25,11 +24,17 @@

protected:

void OpenDevToolsWindow() {

devtools_window_ =

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

+ DevToolsWindow::OpenDevToolsWindowForTest(browser(), true);

}

void CloseDevToolsWindow() {

- DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window_);

+ content::WindowedNotificationObserver close_observer(

+ content::NOTIFICATION_WEB_CONTENTS_DESTROYED,

+ content::Source<content::WebContents>(

+ devtools_window_->web_contents_for_test()));

+ DevToolsWindow::ToggleDevToolsWindow(

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

+ close_observer.Wait();

}

content::WebContents* web_contents() {