diff options
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_focus_uitest.cc | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index d9771db..13c6b94 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -10,7 +10,6 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" @@ -18,6 +17,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/browser.h" #include "chrome/browser/view_ids.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" @@ -53,9 +53,12 @@ // TODO(suzhe): http://crbug.com/49737 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage #elif defined(OS_WIN) -#define MAYBE_FocusTraversal FocusTraversal -#define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial -#define MAYBE_TabsRememberFocusFindInPage TabsRememberFocusFindInPage +// Disabled, http://crbug.com/62543. +#define MAYBE_FocusTraversal DISABLED_FocusTraversal +// Disabled, http://crbug.com/62544. +#define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial +// Flaky, http://crbug.com/62537. +#define MAYBE_TabsRememberFocusFindInPage FLAKY_TabsRememberFocusFindInPage #endif namespace { @@ -208,7 +211,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BrowsersRememberFocus) { } // Tabs remember focus. -IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) { +// Disabled, http://crbug.com/62542. +IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) { ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_TRUE(test_server()->Start()); @@ -314,7 +318,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) { } // Background window does not steal focus. -IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) { +// Flaky, http://crbug.com/62538. +IN_PROC_BROWSER_TEST_F(BrowserFocusTest, + FLAKY_BackgroundBrowserDontStealFocus) { ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_TRUE(test_server()->Start()); @@ -636,7 +642,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) { } // Make sure Find box can request focus, even when it is already open. -IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) { +// Disabled, http://crbug.com/62936. +IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_FindFocusTest) { ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_TRUE(test_server()->Start()); @@ -700,7 +707,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) { // Makes sure the focus is in the right location when opening the different // types of tabs. -IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabInitialFocus) { +// Flaky, http://crbug.com/62539. +IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FLAKY_TabInitialFocus) { ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); // Open the history tab, focus should be on the tab contents. |