chrome/browser/browser_focus_uitest.cc - Issue 10823029: Move WaitForLoadStop from ui_test_utils to browser_test_utils so that it can be reused in content_b…

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/browser_focus_uitest.cc

Issue 10823029: Move WaitForLoadStop from ui_test_utils to browser_test_utils so that it can be reused in content_b… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 8 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/autofill/autofill_browsertest.cc ('k') | chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browser_focus_uitest.cc

===================================================================

--- chrome/browser/browser_focus_uitest.cc (revision 148448)

+++ chrome/browser/browser_focus_uitest.cc (working copy)

@@ -841,26 +841,26 @@

// Open the history tab, focus should be on the tab contents.

chrome::ShowHistory(browser());

- ASSERT_NO_FATAL_FAILURE(ui_test_utils::WaitForLoadStop(

+ ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop(

chrome::GetActiveWebContents(browser())));

EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));

// Open the new tab, focus should be on the location bar.

chrome::NewTab(browser());

- ASSERT_NO_FATAL_FAILURE(ui_test_utils::WaitForLoadStop(

+ ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop(

chrome::GetActiveWebContents(browser())));

EXPECT_TRUE(IsViewFocused(location_bar_focus_view_id_));

// Open the download tab, focus should be on the tab contents.

chrome::ShowDownloads(browser());

- ASSERT_NO_FATAL_FAILURE(ui_test_utils::WaitForLoadStop(

+ ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop(

chrome::GetActiveWebContents(browser())));

EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));

// Open about:blank, focus should be on the location bar.

chrome::AddSelectedTabWithURL(browser(), GURL(chrome::kAboutBlankURL),

content::PAGE_TRANSITION_LINK);

- ASSERT_NO_FATAL_FAILURE(ui_test_utils::WaitForLoadStop(

+ ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop(

chrome::GetActiveWebContents(browser())));

EXPECT_TRUE(IsViewFocused(location_bar_focus_view_id_));

}