diff options
Diffstat (limited to 'chrome/browser')
7 files changed, 9 insertions, 23 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 8d4f2db..1b7ca26 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -497,8 +497,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppTabRemovedWhenExtensionUninstalled) { #endif // !defined(OS_MACOSX) // Tests that the CLD (Compact Language Detection) works properly. -// Flaky, http://crbug.com/42095. -IN_PROC_BROWSER_TEST_F(BrowserTest, FLAKY_PageLanguageDetection) { +IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) { static const wchar_t kDocRoot[] = L"chrome/test/data"; scoped_refptr<HTTPTestServer> server( HTTPTestServer::CreateServer(kDocRoot, NULL)); @@ -652,9 +651,6 @@ class BrowserAppRefocusTest : public ExtensionBrowserTest { #if defined(OS_WIN) -// OpenTab hangs flakily. -// http://code.google.com/p/chromium/issues/detail?id=44026 -#define MAYBE_OpenTab FLAKY_OpenTab #define MAYBE_OpenPanel OpenPanel #define MAYBE_OpenWindow OpenWindow #define MAYBE_WindowBeforeTab WindowBeforeTab @@ -667,7 +663,6 @@ class BrowserAppRefocusTest : public ExtensionBrowserTest { // ChromeOS doesn't open extension based app windows correctly yet: // http://crbug.com/43061 -#define MAYBE_OpenTab DISABLED_OpenTab #define MAYBE_OpenPanel DISABLED_OpenPanel #define MAYBE_OpenWindow DISABLED_OpenWindow #define MAYBE_WindowBeforeTab DISABLED_WindowBeforeTab @@ -677,7 +672,8 @@ class BrowserAppRefocusTest : public ExtensionBrowserTest { #endif // Test that launching an app refocuses a tab already hosting the app. -IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenTab) { +// Hangs flakily, http://crbug.com/44026. +IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, DISABLED_OpenTab) { SetUpExtensionApp(); ui_test_utils::NavigateToURL(browser(), url_); diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 35ee14f..99bfa9d 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -58,8 +58,7 @@ static void NavigateTabHelper(TabContents* contents, const GURL& url) { EXPECT_EQ(url, contents->controller().GetLastCommittedEntry()->url()); } -// This test is flaky, see bug 42497. -IN_PROC_BROWSER_TEST_F(AppApiTest, FLAKY_AppProcess) { +IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) { host_resolver()->AddRule("*", "127.0.0.1"); ASSERT_TRUE(StartHTTPServer()); diff --git a/chrome/browser/extensions/extension_infobar_apitest.cc b/chrome/browser/extensions/extension_infobar_apitest.cc index ff2bfc12..47f726e 100644 --- a/chrome/browser/extensions/extension_infobar_apitest.cc +++ b/chrome/browser/extensions/extension_infobar_apitest.cc @@ -7,14 +7,8 @@ #include "chrome/common/chrome_switches.h" #if defined(TOOLKIT_VIEWS) -#if defined (OS_WIN) #define MAYBE_Infobars Infobars #else -// Flaky on ChromeOS, see http://crbug.com/40141. -#define MAYBE_Infobars FLAKY_Infobars -#endif - -#else // Need to port ExtensionInfoBarDelegate::CreateInfoBar() to other platforms. // See http://crbug.com/39916 for details. #define MAYBE_Infobars DISABLED_Infobars diff --git a/chrome/browser/find_bar_host_browsertest.cc b/chrome/browser/find_bar_host_browsertest.cc index 44dc8ba..cf51288 100644 --- a/chrome/browser/find_bar_host_browsertest.cc +++ b/chrome/browser/find_bar_host_browsertest.cc @@ -613,9 +613,6 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, // http://crbug.com/22036 #if defined(OS_MACOSX) #define MAYBE_FindMovesWhenObscuring DISABLED_FindMovesWhenObscuring -// It's flaky, at least on Windows. http://crbug.com/41124 -#elif defined(OS_WIN) -#define MAYBE_FindMovesWhenObscuring FLAKY_FindMovesWhenObscuring #else #define MAYBE_FindMovesWhenObscuring FindMovesWhenObscuring #endif diff --git a/chrome/browser/process_singleton_linux_uitest.cc b/chrome/browser/process_singleton_linux_uitest.cc index 26a5b398..ef42966 100644 --- a/chrome/browser/process_singleton_linux_uitest.cc +++ b/chrome/browser/process_singleton_linux_uitest.cc @@ -85,8 +85,8 @@ TEST_F(ProcessSingletonLinuxTest, CheckSocketFile) { // The following tests in linux/view does not pass without a window manager, // which is true in build/try bots. // See http://crbug.com/30953. -#define NotifyOtherProcessSuccess FLAKY_NotifyOtherProcessSuccess -#define NotifyOtherProcessHostChanged FLAKY_NotifyOtherProcessHostChanged +#define NotifyOtherProcessSuccess FAILS_NotifyOtherProcessSuccess +#define NotifyOtherProcessHostChanged FAILS_NotifyOtherProcessHostChanged #endif // TODO(james.su@gmail.com): port following tests to Windows. diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 3c6f8bc..e3b45ef 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -370,8 +370,7 @@ TEST_F(SessionRestoreUITest, DontRestoreWhileIncognito) { } // Creates two windows, closes one, restores, make sure only one window open. -// http://crbug.com/39905 -TEST_F(SessionRestoreUITest, FLAKY_TwoWindowsCloseOneRestoreOnlyOne) { +TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) { NavigateToURL(url1_); // Make sure we have one window. diff --git a/chrome/browser/views/browser_views_accessibility_browsertest.cc b/chrome/browser/views/browser_views_accessibility_browsertest.cc index bddbb2d..d20452e 100644 --- a/chrome/browser/views/browser_views_accessibility_browsertest.cc +++ b/chrome/browser/views/browser_views_accessibility_browsertest.cc @@ -124,8 +124,9 @@ class BrowserViewsAccessibilityTest : public InProcessBrowserTest { }; // Retrieve accessibility object for main window and verify accessibility info. +// Fails, http://crbug.com/44486. IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestChromeWindowAccObj) { + FAILS_TestChromeWindowAccObj) { BrowserWindow* browser_window = browser()->window(); ASSERT_TRUE(NULL != browser_window); |