commit 3e256ad41fdb6711f19c85cc80a7c860304a9b45
author warx <warx@chromium.org> Wed Nov 16 19:14:04 2016
committer Commit bot <commit-bot@chromium.org> Wed Nov 16 19:23:27 2016
tree c2615662a62e15d234638f6eb1717b24a69412a8
parent 88bfc417f0244004b44720aec76f6bee1a9aaacb

Re-enable tabs_interactive_uitest for linux_aura

Changes include:
(1) change BringBrowserWindowToFront with BrowserActivationWaiter support
(2) enable tabs_interactive_uitest for linux_aura

BUG=665233
TEST=automate tests

Review-Url: https://codereview.chromium.org/2500093003
Cr-Commit-Position: refs/heads/master@{#432584}

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 9ce91d1..f249ded0 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -331,9 +331,6 @@
 
 // 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();
   const GURL url = embedded_test_server()->GetURL(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
@@ -419,10 +416,6 @@
 
 // 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();
-
   // Open the page that steals focus.
   const GURL url = embedded_test_server()->GetURL(kStealFocusPage);
   ui_test_utils::NavigateToURL(browser(), url);
@@ -562,10 +555,6 @@
 
 // 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();
-
   // Open the new tab, reload.
   {
     content::WindowedNotificationObserver observer(
@@ -685,10 +674,9 @@
 #define MAYBE_FocusOnNavigate FocusOnNavigate
 #endif
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusOnNavigate) {
+  // Needed on Mac.
+  // TODO(warx): check why it is needed on Mac.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
-  ui_test_utils::BrowserActivationWaiter waiter(browser());
-  waiter.WaitForActivation();
-
   // Load the NTP.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
   EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX));