Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2843)

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

Issue 2500093003: Re-enable tabs_interactive_uitest for linux_aura (Closed)
Patch Set: Created 4 years, 1 month 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
Index: chrome/browser/ui/browser_focus_uitest.cc
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index d4805c40efd67477054dcc6f4096947f7a273ea0..a407485f4eea88c0c55589c37d9e14ca1e87b4b1 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -331,9 +331,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) {
// Tabs remember focus with find-in-page box.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocusFindInPage) {
- ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
- ui_test_utils::BrowserActivationWaiter waiter(browser());
- waiter.WaitForActivation();
+ ui_test_utils::ActivateBrowserWindow(browser());
const GURL url = embedded_test_server()->GetURL(kSimplePage);
ui_test_utils::NavigateToURL(browser(), url);
@@ -419,9 +417,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest,
// Page cannot steal focus when focus is on location bar.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) {
- ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
- ui_test_utils::BrowserActivationWaiter waiter(browser());
- waiter.WaitForActivation();
+ ui_test_utils::ActivateBrowserWindow(browser());
// Open the page that steals focus.
const GURL url = embedded_test_server()->GetURL(kStealFocusPage);
@@ -562,9 +558,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabInitialFocus) {
// Tests that focus goes where expected when using reload.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) {
- ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
- ui_test_utils::BrowserActivationWaiter waiter(browser());
- waiter.WaitForActivation();
+ ui_test_utils::ActivateBrowserWindow(browser());
// Open the new tab, reload.
{
@@ -679,9 +673,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, NavigateFromOmniboxIntoNewTab) {
}
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnNavigate) {
- ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
- ui_test_utils::BrowserActivationWaiter waiter(browser());
- waiter.WaitForActivation();
+ ui_test_utils::ActivateBrowserWindow(browser());
// Load the NTP.
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));

Powered by Google App Engine
This is Rietveld 408576698