diff options
22 files changed, 66 insertions, 74 deletions
diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc index d34f796..216a5cb 100644 --- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc +++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -135,7 +135,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // info. // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestNonClientViewAccObj) { + DISABLED_TestNonClientViewAccObj) { views::View* non_client_view = GetBrowserView()->GetWidget()->non_client_view(); @@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // accessibility info. // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestBrowserRootViewAccObj) { + DISABLED_TestBrowserRootViewAccObj) { views::View* browser_root_view = GetBrowserView()->frame()->GetRootView(); TestViewAccessibilityObject( @@ -160,7 +160,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // Retrieve accessibility object for browser view and verify accessibility info. // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestBrowserViewAccObj) { + DISABLED_TestBrowserViewAccObj) { // Verify root view MSAA name and role. TestViewAccessibilityObject( GetBrowserView(), @@ -171,7 +171,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // Retrieve accessibility object for toolbar view and verify accessibility info. // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestToolbarViewAccObj) { + DISABLED_TestToolbarViewAccObj) { // Verify toolbar MSAA name and role. TestViewAccessibilityObject( GetToolbarView(), @@ -182,7 +182,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // Retrieve accessibility object for Back button and verify accessibility info. // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestBackButtonAccObj) { + DISABLED_TestBackButtonAccObj) { // Verify Back button MSAA name and role. TestViewAccessibilityObject( GetToolbarView()->GetViewByID(VIEW_ID_BACK_BUTTON), @@ -194,7 +194,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // info. // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestForwardButtonAccObj) { + DISABLED_TestForwardButtonAccObj) { // Verify Forward button MSAA name and role. TestViewAccessibilityObject( GetToolbarView()->GetViewByID(VIEW_ID_FORWARD_BUTTON), @@ -206,7 +206,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // info. // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestReloadButtonAccObj) { + DISABLED_TestReloadButtonAccObj) { // Verify Reload button MSAA name and role. TestViewAccessibilityObject( GetToolbarView()->GetViewByID(VIEW_ID_RELOAD_BUTTON), @@ -217,7 +217,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // Retrieve accessibility object for Home button and verify accessibility info. // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestHomeButtonAccObj) { + DISABLED_TestHomeButtonAccObj) { // Verify Home button MSAA name and role. TestViewAccessibilityObject( GetToolbarView()->GetViewByID(VIEW_ID_HOME_BUTTON), @@ -228,7 +228,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // Retrieve accessibility object for Star button and verify accessibility info. // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestStarButtonAccObj) { + DISABLED_TestStarButtonAccObj) { // Verify Star button MSAA name and role. TestViewAccessibilityObject( GetToolbarView()->GetViewByID(VIEW_ID_STAR_BUTTON), @@ -239,7 +239,8 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, // Retrieve accessibility object for App menu button and verify accessibility // info. // http://crbug.com/104132 -IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, FLAKY_TestAppMenuAccObj) { +IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, + DISABLED_TestAppMenuAccObj) { // Verify App menu button MSAA name and role. TestViewAccessibilityObject( GetToolbarView()->GetViewByID(VIEW_ID_APP_MENU), @@ -249,7 +250,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, FLAKY_TestAppMenuAccObj) { // http://crbug.com/104132 IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, - FLAKY_TestBookmarkBarViewAccObj) { + DISABLED_TestBookmarkBarViewAccObj) { TestViewAccessibilityObject( GetBookmarkBarView(), UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS)), diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc index ef481b3..7c9e2c9 100644 --- a/chrome/browser/autocomplete/autocomplete_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc @@ -31,7 +31,7 @@ // Autocomplete test is flaky on ChromeOS. // http://crbug.com/52928 #if defined(OS_CHROMEOS) -#define MAYBE_Autocomplete FLAKY_Autocomplete +#define MAYBE_Autocomplete DISABLED_Autocomplete #else #define MAYBE_Autocomplete Autocomplete #endif diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 6796fd8..99b9e4f 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -474,7 +474,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillFormWithRepeatedField) { #if defined(OS_WIN) // Has been observed to fail on windows. crbug.com/100062 #define MAYBE_AutofillFormWithNonAutofillableField \ - FLAKY_AutofillFormWithNonAutofillableField + DISABLED_AutofillFormWithNonAutofillableField #else #define MAYBE_AutofillFormWithNonAutofillableField \ AutofillFormWithNonAutofillableField diff --git a/chrome/browser/bookmarks/bookmark_extension_apitest.cc b/chrome/browser/bookmarks/bookmark_extension_apitest.cc index 68a025b..fd538f9 100644 --- a/chrome/browser/bookmarks/bookmark_extension_apitest.cc +++ b/chrome/browser/bookmarks/bookmark_extension_apitest.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "chrome/browser/extensions/extension_apitest.h" // Flaky test, http://crbug.com/89762. -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Bookmarks) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Bookmarks) { ASSERT_TRUE(RunExtensionTest("bookmarks")) << message_; } diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc index fd9e362..2be24e6 100644 --- a/chrome/browser/browser_encoding_uitest.cc +++ b/chrome/browser/browser_encoding_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include <string> @@ -53,8 +53,9 @@ class BrowserEncodingTest : public UITest { // encoding name). Webkit layout tests cover some, but testing in the UI test is // also necessary. +// http://crbug.com/82616 #if defined(OS_MACOSX) -#define TestEncodingAliasMapping FLAKY_TestEncodingAliasMapping +#define TestEncodingAliasMapping DISABLED_TestEncodingAliasMapping #endif TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) { struct EncodingTestData { @@ -115,7 +116,7 @@ TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) { } // Marked as flaky: see http://crbug.com/44668 -TEST_F(BrowserEncodingTest, FLAKY_TestOverrideEncoding) { +TEST_F(BrowserEncodingTest, DISABLED_TestOverrideEncoding) { const char* const kTestFileName = "gb18030_with_iso88591_meta.html"; const char* const kExpectedFileName = "expected_gb18030_saved_from_iso88591_meta.html"; @@ -178,7 +179,7 @@ TEST_F(BrowserEncodingTest, FLAKY_TestOverrideEncoding) { #if defined(OS_CHROMEOS) #define MAYBE_TestEncodingAutoDetect DISABLED_TestEncodingAutoDetect #else -#define MAYBE_TestEncodingAutoDetect FLAKY_TestEncodingAutoDetect +#define MAYBE_TestEncodingAutoDetect DISABLED_TestEncodingAutoDetect #endif TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) { diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 9a2d093..7f39489 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -75,7 +75,7 @@ using content::WebContents; #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage #elif defined(OS_WIN) // Flaky, http://crbug.com/62537. -#define MAYBE_TabsRememberFocusFindInPage FLAKY_TabsRememberFocusFindInPage +#define MAYBE_TabsRememberFocusFindInPage DISABLED_TabsRememberFocusFindInPage #endif namespace { @@ -241,7 +241,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) { } // Flaky, http://crbug.com/69034. -IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FLAKY_BrowsersRememberFocus) { +IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_BrowsersRememberFocus) { ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_TRUE(test_server()->Start()); @@ -416,7 +416,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) { // Background window does not steal focus. // Flaky, http://crbug.com/62538. IN_PROC_BROWSER_TEST_F(BrowserFocusTest, - FLAKY_BackgroundBrowserDontStealFocus) { + DISABLED_BackgroundBrowserDontStealFocus) { ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); ASSERT_TRUE(test_server()->Start()); @@ -729,7 +729,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { // Focus stays on page with interstitials. // http://crbug.com/81451 #if defined(OS_MACOSX) || defined(OS_WIN) -IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FLAKY_InterstitialFocus) { +IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_InterstitialFocus) { #else IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) { #endif @@ -769,7 +769,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) { // Make sure Find box can request focus, even when it is already open. // Flaky on mac and valgrind. http://crbug.com/67301. #if defined(OS_MACOSX) -#define MAYBE_FindFocusTest FLAKY_FindFocusTest +#define MAYBE_FindFocusTest DISABLED_FindFocusTest #else #define MAYBE_FindFocusTest FindFocusTest #endif @@ -827,7 +827,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FindFocusTest) { // Makes sure the focus is in the right location when opening the different // types of tabs. // Flaky, http://crbug.com/62539. -IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FLAKY_TabInitialFocus) { +IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabInitialFocus) { ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); // Open the history tab, focus should be on the tab contents. diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index df3145a..8281c82 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -470,7 +470,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) { } #elif defined(OS_MACOSX) // http://crbug.com/81451 -IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, FLAKY_CommandKeyEvents) { +IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_CommandKeyEvents) { static const KeyEventTestData kTestCmdF = { ui::VKEY_F, false, false, false, true, false, false, false, false, 2, @@ -657,7 +657,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) { // Flaky, http://crbug.com/69475. #if defined(OS_LINUX) -#define MAYBE_ReservedAccelerators FLAKY_ReservedAccelerators +#define MAYBE_ReservedAccelerators DISABLED_ReservedAccelerators #else #define MAYBE_ReservedAccelerators ReservedAccelerators #endif diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc index 2b53764..611007a 100644 --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -690,7 +690,8 @@ TEST_F(ParallelAuthenticatorTest, DriveOnlineLogin) { RunResolve(auth_.get(), &message_loop_); } -TEST_F(ParallelAuthenticatorTest, FLAKY_DriveNeedNewPassword) { +// http://crbug.com/106538 +TEST_F(ParallelAuthenticatorTest, DISABLED_DriveNeedNewPassword) { FailOnLoginSuccess(); // Set failing on success as the default... // ...but expect ONE successful login first. ExpectLoginSuccess(username_, password_, result_, true); diff --git a/chrome/browser/chromeos/notifications/notification_browsertest.cc b/chrome/browser/chromeos/notifications/notification_browsertest.cc index 1d2a417..14be581 100644 --- a/chrome/browser/chromeos/notifications/notification_browsertest.cc +++ b/chrome/browser/chromeos/notifications/notification_browsertest.cc @@ -485,7 +485,7 @@ IN_PROC_BROWSER_TEST_F(NotificationTest, DISABLED_TestScrollBalloonToVisible) { } // Seems to be flaky. http://crbug.com/84427 -IN_PROC_BROWSER_TEST_F(NotificationTest, FLAKY_TestActivateDeactivate) { +IN_PROC_BROWSER_TEST_F(NotificationTest, DISABLED_TestActivateDeactivate) { BalloonCollectionImpl* collection = GetBalloonCollectionImpl(); NotificationPanel* panel = GetNotificationPanel(); NotificationPanelTester* tester = panel->GetTester(); diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index b39e4ed..aff5fd7 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -444,8 +444,9 @@ IN_PROC_BROWSER_TEST_F(DevToolsExperimentalExtensionTest, } // Tests that a content script is in the scripts list. +// http://crbug.com/114104 IN_PROC_BROWSER_TEST_F(DevToolsExtensionTest, - FLAKY_TestContentScriptIsPresent) { + DISABLED_TestContentScriptIsPresent) { LoadExtension("simple_content_script"); RunTest("testContentScriptIsPresent", kPageWithContentScript); } @@ -497,7 +498,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleOnNavigateBack) { #if defined(OS_LINUX) || defined(OS_MACOSX) // http://crbug.com/103539 -#define TestReattachAfterCrash FLAKY_TestReattachAfterCrash +#define TestReattachAfterCrash DISABLED_TestReattachAfterCrash #endif // Tests that inspector will reattach to inspected page when it is reloaded // after a crash. See http://crbug.com/101952 @@ -542,14 +543,11 @@ IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, MAYBE_InspectSharedWorker) { } // http://crbug.com/100538 -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_WIN) #define MAYBE_PauseInSharedWorkerInitialization DISABLED_PauseInSharedWorkerInitialization -#elif defined(OS_WIN) -#define MAYBE_PauseInSharedWorkerInitialization FLAKY_PauseInSharedWorkerInitialization #else #define MAYBE_PauseInSharedWorkerInitialization PauseInSharedWorkerInitialization #endif -// See http://crbug.com/100538 // http://crbug.com/106114 is masking // MAYBE_PauseInSharedWorkerInitialization into diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index 471f9ea..dc17761 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -105,7 +105,7 @@ class ErrorPageTest : public InProcessBrowserTest { // See crbug.com/109669 #if defined(USE_AURA) -#define MAYBE_DNSError_Basic FLAKY_DNSError_Basic +#define MAYBE_DNSError_Basic DISABLED_DNSError_Basic #else #define MAYBE_DNSError_Basic DNSError_Basic #endif @@ -128,7 +128,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack1) { // See crbug.com/109669 #if defined(USE_AURA) -#define MAYBE_DNSError_GoBack2 FLAKY_DNSError_GoBack2 +#define MAYBE_DNSError_GoBack2 DISABLED_DNSError_GoBack2 #else #define MAYBE_DNSError_GoBack2 DNSError_GoBack2 #endif @@ -147,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_GoBack2) { // See crbug.com/109669 #if defined(USE_AURA) -#define MAYBE_DNSError_GoBack2AndForward FLAKY_DNSError_GoBack2AndForward +#define MAYBE_DNSError_GoBack2AndForward DISABLED_DNSError_GoBack2AndForward #else #define MAYBE_DNSError_GoBack2AndForward DNSError_GoBack2AndForward #endif @@ -168,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_DNSError_GoBack2AndForward) { // See crbug.com/109669 #if defined(USE_AURA) -#define MAYBE_DNSError_GoBack2Forward2 FLAKY_DNSError_GoBack2Forward2 +#define MAYBE_DNSError_GoBack2Forward2 DISABLED_DNSError_GoBack2Forward2 #else #define MAYBE_DNSError_GoBack2Forward2 DNSError_GoBack2Forward2 #endif diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index b7d2430..9c98df7 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -122,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) { // This test is flaky as per http://crbug.com/74557. IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, - FLAKY_TabSpecificBrowserActionState) { + DISABLED_TabSpecificBrowserActionState) { ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) << message_; const Extension* extension = GetSingleLoadedExtension(); diff --git a/chrome/browser/extensions/extension_content_settings_apitest.cc b/chrome/browser/extensions/extension_content_settings_apitest.cc index f7ad22b..6938c12 100644 --- a/chrome/browser/extensions/extension_content_settings_apitest.cc +++ b/chrome/browser/extensions/extension_content_settings_apitest.cc @@ -94,7 +94,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) { // Flaky on the trybots. See http://crbug.com/96725. IN_PROC_BROWSER_TEST_F(ExtensionApiTest, - FLAKY_ContentSettingsGetResourceIdentifiers) { + DISABLED_ContentSettingsGetResourceIdentifiers) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc index 27ac161..8189f15 100644 --- a/chrome/browser/extensions/extension_devtools_browsertests.cc +++ b/chrome/browser/extensions/extension_devtools_browsertests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -51,7 +51,7 @@ static ExtensionHost* FindHostWithPath(ExtensionProcessManager* manager, // Tests for the experimental timeline extensions API. // TODO(johnnyg): crbug.com/52544 Test was broken by webkit r65510. -IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, FLAKY_TimelineApi) { +IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, DISABLED_TimelineApi) { ASSERT_TRUE(LoadExtension( test_data_dir_.AppendASCII("devtools").AppendASCII("timeline_api"))); diff --git a/chrome/browser/extensions/extension_geolocation_apitest.cc b/chrome/browser/extensions/extension_geolocation_apitest.cc index 3602b0c..067f5b7 100644 --- a/chrome/browser/extensions/extension_geolocation_apitest.cc +++ b/chrome/browser/extensions/extension_geolocation_apitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -25,8 +25,9 @@ class GeolocationApiTest : public ExtensionApiTest { content::MockGeolocation mock_geolocation_; }; +// http://crbug.com/68287 IN_PROC_BROWSER_TEST_F(GeolocationApiTest, - FLAKY_ExtensionGeolocationAccessFail) { + DISABLED_ExtensionGeolocationAccessFail) { // Test that geolocation cannot be accessed from extension without permission. ASSERT_TRUE(RunExtensionTest("geolocation/no_permission")) << message_; } diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc index f1412d3..71879d9 100644 --- a/chrome/browser/extensions/extension_install_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -40,7 +40,7 @@ class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest { // Flaky on linux. See http://crbug.com/86105 #if defined(OS_LINUX) #define MAYBE_TestThemeInstallUndoResetsToDefault \ -FLAKY_TestThemeInstallUndoResetsToDefault +DISABLED_TestThemeInstallUndoResetsToDefault #else #define MAYBE_TestThemeInstallUndoResetsToDefault \ TestThemeInstallUndoResetsToDefault @@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest, // Flaky on linux. See http://crbug.com/86105 #if defined(OS_LINUX) #define MAYBE_TestThemeInstallUndoResetsToPreviousTheme \ -FLAKY_TestThemeInstallUndoResetsToPreviousTheme +DISABLED_TestThemeInstallUndoResetsToPreviousTheme #else #define MAYBE_TestThemeInstallUndoResetsToPreviousTheme \ TestThemeInstallUndoResetsToPreviousTheme diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc index b2168c1..5ed7fd8 100644 --- a/chrome/browser/extensions/extension_management_browsertest.cc +++ b/chrome/browser/extensions/extension_management_browsertest.cc @@ -90,7 +90,7 @@ class ExtensionManagementTest : public ExtensionBrowserTest { #if defined(OS_LINUX) // Times out sometimes on Linux. http://crbug.com/89727 -#define MAYBE_InstallSameVersion FLAKY_InstallSameVersion +#define MAYBE_InstallSameVersion DISABLED_InstallSameVersion #else #define MAYBE_InstallSameVersion InstallSameVersion #endif diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index c4c867e..afb94ca 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -53,7 +53,7 @@ class MessageSender : public content::NotificationObserver { // Tests that message passing between extensions and content scripts works. // Flaky on the trybots. See http://crbug.com/96725. -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Messaging) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Messaging) { ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_; } diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index 84b565f..66acc53 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc @@ -112,7 +112,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, Audio) { #if defined(OS_MACOSX) // http://crbug.com/95274 - Video is flaky on Mac. -#define MAYBE_Video FLAKY_Video +#define MAYBE_Video DISABLED_Video #else #define MAYBE_Video Video #endif diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index 4a67911..f7ef69a 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -214,7 +214,7 @@ class ExtensionsLoadTest : public ExtensionStartupTestBase { // Fails inconsistently on Linux x64. http://crbug.com/80961 #if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -#define Maybe_Test FLAKY_Test +#define Maybe_Test DISABLED_Test #else #define Maybe_Test Test #endif diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 07e668f..ecb84ec 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -102,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) { } // Flaky on the trybots. See http://crbug.com/96725. -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_TabConnect) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabConnect) { ASSERT_TRUE(StartTestServer()); ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; } @@ -117,12 +117,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabReload) { // Test is timing out on linux and cros and flaky on others. // See http://crbug.com/83876 -#if defined(OS_LINUX) -#define MAYBE_CaptureVisibleTabJpeg DISABLED_CaptureVisibleTabJpeg -#else -#define MAYBE_CaptureVisibleTabJpeg FLAKY_CaptureVisibleTabJpeg -#endif -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabJpeg) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_CaptureVisibleTabJpeg) { host_resolver()->AddRule("a.com", "127.0.0.1"); host_resolver()->AddRule("b.com", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); @@ -132,12 +127,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabJpeg) { // Test is timing out on linux and cros and flaky on others. // See http://crbug.com/83876 -#if defined(OS_LINUX) -#define MAYBE_CaptureVisibleTabPng DISABLED_CaptureVisibleTabPng -#else -#define MAYBE_CaptureVisibleTabPng FLAKY_CaptureVisibleTabPng -#endif -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTabPng) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_CaptureVisibleTabPng) { host_resolver()->AddRule("a.com", "127.0.0.1"); host_resolver()->AddRule("b.com", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); diff --git a/chrome/browser/extensions/page_action_apitest.cc b/chrome/browser/extensions/page_action_apitest.cc index 46da8ff..b0417af 100644 --- a/chrome/browser/extensions/page_action_apitest.cc +++ b/chrome/browser/extensions/page_action_apitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -166,7 +166,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OldPageActions) { // Tests popups in page actions. // Flaky on the trybots. See http://crbug.com/96725. -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_ShowPageActionPopup) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ShowPageActionPopup) { ASSERT_TRUE(RunExtensionTest("page_action/popup")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; |