diff options
15 files changed, 80 insertions, 26 deletions
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index 65d5759..bd26bb7 100644 --- a/chrome/browser/apps/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -1460,7 +1460,13 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, PRE_StoragePersistence) { // This is the post-reset portion of the StoragePersistence test. See // PRE_StoragePersistence for main comment. -IN_PROC_BROWSER_TEST_F(WebViewTest, StoragePersistence) { +#if defined(OS_CHROMEOS) +// http://crbug.com/223888 +#define MAYBE_StoragePersistence DISABLED_StoragePersistence +#else +#define MAYBE_StoragePersistence StoragePersistence +#endif +IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_StoragePersistence) { ASSERT_TRUE(StartEmbeddedTestServer()); // We don't care where the main browser is on this test. diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc index 1d0f70b..a359a23 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc @@ -67,7 +67,8 @@ class LoggedInSpokenFeedbackTest : public InProcessBrowserTest { DISALLOW_COPY_AND_ASSIGN(LoggedInSpokenFeedbackTest); }; -IN_PROC_BROWSER_TEST_F(LoggedInSpokenFeedbackTest, AddBookmark) { +// http://crbug.com/396507 +IN_PROC_BROWSER_TEST_F(LoggedInSpokenFeedbackTest, DISABLED_AddBookmark) { EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled()); SpeechMonitor monitor; diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc index 5445552..227bd87 100644 --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc @@ -573,7 +573,8 @@ TEST_F(LoginUtilsTest, RlzInitialized) { } #endif -TEST_P(LoginUtilsBlockingLoginTest, LoginBlocksForUser) { +// http://crbug.com/396506 +TEST_P(LoginUtilsBlockingLoginTest, DISABLED_LoginBlocksForUser) { UserManager* user_manager = UserManager::Get(); EXPECT_FALSE(user_manager->IsUserLoggedIn()); EXPECT_FALSE(connector_->IsEnterpriseManaged()); diff --git a/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc b/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc index f3483b4..f03876e 100644 --- a/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc +++ b/chrome/browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc @@ -286,7 +286,8 @@ class CertVerifyProcChromeOSOrderingTest // Test a variety of different combinations of (maybe) verifying / (maybe) // importing / verifying again, to try to find any cases where caching might // affect the results. -TEST_P(CertVerifyProcChromeOSOrderingTest, TrustThenVerify) { +// http://crbug.com/396501 +TEST_P(CertVerifyProcChromeOSOrderingTest, DISABLED_TrustThenVerify) { const ParamType& param = GetParam(); const bool verify_first = std::tr1::get<0>(param); const int trust_bitmask = std::tr1::get<1>(param); diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index d06ad1c..b16c240 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -668,7 +668,8 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, FullscreenDisallowed) { EXPECT_FALSE(browser_window->IsFullscreen()); } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsUncached) { +// http://crbug.com/393208 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_ExtensionsUncached) { // Make it possible to force-install a hosted app and an extension. ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); TestingUpdateManifestProvider testing_update_manifest_provider( diff --git a/chrome/browser/chromeos/policy/policy_cert_verifier_unittest.cc b/chrome/browser/chromeos/policy/policy_cert_verifier_unittest.cc index bcb5057..23380a4 100644 --- a/chrome/browser/chromeos/policy/policy_cert_verifier_unittest.cc +++ b/chrome/browser/chromeos/policy/policy_cert_verifier_unittest.cc @@ -176,7 +176,8 @@ TEST_F(PolicyCertVerifierTest, VerifyTrustedCert) { EXPECT_FALSE(WasTrustAnchorUsedAndReset()); } -TEST_F(PolicyCertVerifierTest, VerifyUsingAdditionalTrustAnchor) { +// http://crbug.com/396497 +TEST_F(PolicyCertVerifierTest, DISABLED_VerifyUsingAdditionalTrustAnchor) { ASSERT_TRUE(SupportsAdditionalTrustAnchors()); // |test_server_cert_| is untrusted, so Verify() fails. diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index 4f64b50..556fda4 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc @@ -803,8 +803,14 @@ downloads::InterruptReason InterruptReasonContentToExtension( } // namespace +#if defined(OS_CHROMEOS) +// http://crbug.com/396510 +#define MAYBE_DownloadExtensionTest_Open DISABLED_DownloadExtensionTest_Open +#else +#define MAYBE_DownloadExtensionTest_Open DownloadExtensionTest_Open +#endif IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, - DownloadExtensionTest_Open) { + MAYBE_DownloadExtensionTest_Open) { LoadExtension("downloads_split"); DownloadsOpenFunction* open_function = new DownloadsOpenFunction(); open_function->set_user_gesture(true); diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 832ded9..bb295ed 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -4265,7 +4265,13 @@ class ExtensionCookieCallback { }; // Verifies extension state is removed upon uninstall. -TEST_F(ExtensionServiceTest, ClearExtensionData) { +#if defined(OS_CHROMEOS) +// http://crbug.com/396504 +#define MAYBE_ClearExtensionData DISABLED_ClearExtensionData +#else +#define MAYBE_ClearExtensionData ClearExtensionData +#endif +TEST_F(ExtensionServiceTest, MAYBE_ClearExtensionData) { InitializeEmptyExtensionService(); ExtensionCookieCallback callback; diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc index fb5981d..ba1cfcd 100644 --- a/chrome/browser/media/chrome_webrtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc @@ -40,7 +40,15 @@ class WebRtcBrowserTest : public WebRtcTestBase { } }; -IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, RunsAudioVideoWebRTCCallInTwoTabs) { +#if defined(OS_WIN) || defined(OS_CHROMEOS) +// http://crbug.com/396505 +#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs \ + DISABLED_RunsAudioVideoWebRTCCallInTwoTabs +#else +#define MAYBE_RunsAudioVideoWebRTCCallInTwoTabs RunsAudioVideoWebRTCCallInTwoTabs +#endif +IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, + MAYBE_RunsAudioVideoWebRTCCallInTwoTabs) { if (OnWinXp()) return; ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); diff --git a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc index 7be8bf2..a7ec461 100644 --- a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc +++ b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc @@ -169,7 +169,13 @@ class ShowAppListInteractiveTest : public InProcessBrowserTest { }; // Test showing the app list using the command line switch. -IN_PROC_BROWSER_TEST_F(ShowAppListInteractiveTest, ShowAppListFlag) { +#if defined(OS_CHROMEOS) +// http://crbug.com/396499 +#define MAYBE_ShowAppListFlag DISABLED_ShowAppListFlag +#else +#define MAYBE_ShowAppListFlag ShowAppListFlag +#endif +IN_PROC_BROWSER_TEST_F(ShowAppListInteractiveTest, MAYBE_ShowAppListFlag) { AppListService* service = test::GetAppListService(); // The app list should already be shown because we passed // switches::kShowAppList. diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc index 7735b40..6c01f60 100644 --- a/chrome/test/ppapi/ppapi_browsertest.cc +++ b/chrome/test/ppapi/ppapi_browsertest.cc @@ -1322,7 +1322,8 @@ TEST_PPAPI_OUT_OF_PROCESS(FlashFile) // Mac/Aura reach NOTIMPLEMENTED/time out. // mac: http://crbug.com/96767 // aura: http://crbug.com/104384 -#if defined(OS_MACOSX) +// cros: http://crbug.com/396502 +#if defined(OS_MACOSX) || defined(OS_CHROMEOS) #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen #else #define MAYBE_FlashFullscreen FlashFullscreen diff --git a/chromeos/process_proxy/process_output_watcher_unittest.cc b/chromeos/process_proxy/process_output_watcher_unittest.cc index 8e4c1665..d032725 100644 --- a/chromeos/process_proxy/process_output_watcher_unittest.cc +++ b/chromeos/process_proxy/process_output_watcher_unittest.cc @@ -177,8 +177,8 @@ class ProcessOutputWatcherTest : public testing::Test { std::vector<TestCase> exp; }; - -TEST_F(ProcessOutputWatcherTest, OutputWatcher) { +// http://crbug.com/396496 +TEST_F(ProcessOutputWatcherTest, DISABLED_OutputWatcher) { std::vector<TestCase> test_cases; test_cases.push_back(TestCase("t", false)); test_cases.push_back(TestCase("testing output\n", false)); @@ -193,7 +193,8 @@ TEST_F(ProcessOutputWatcherTest, OutputWatcher) { RunTest(test_cases); }; -TEST_F(ProcessOutputWatcherTest, SplitUTF8Character) { +// http://crbug.com/396496 +TEST_F(ProcessOutputWatcherTest, DISABLED_SplitUTF8Character) { std::vector<TestCase> test_cases; test_cases.push_back(TestCase("test1\xc2", false, "test1")); test_cases.push_back(TestCase("\xb5test1", false, "\xc2\xb5test1")); @@ -201,7 +202,8 @@ TEST_F(ProcessOutputWatcherTest, SplitUTF8Character) { RunTest(test_cases); } -TEST_F(ProcessOutputWatcherTest, SplitSoleUTF8Character) { +// http://crbug.com/396496 +TEST_F(ProcessOutputWatcherTest, DISABLED_SplitSoleUTF8Character) { std::vector<TestCase> test_cases; test_cases.push_back(TestCase("\xc2", false, "")); test_cases.push_back(TestCase("\xb5", false, "\xc2\xb5")); @@ -209,7 +211,8 @@ TEST_F(ProcessOutputWatcherTest, SplitSoleUTF8Character) { RunTest(test_cases); } -TEST_F(ProcessOutputWatcherTest, SplitUTF8CharacterLength3) { +// http://crbug.com/396496 +TEST_F(ProcessOutputWatcherTest, DISABLED_SplitUTF8CharacterLength3) { std::vector<TestCase> test_cases; test_cases.push_back(TestCase("test3\xe2\x82", false, "test3")); test_cases.push_back(TestCase("\xac", false, "\xe2\x82\xac")); @@ -217,7 +220,8 @@ TEST_F(ProcessOutputWatcherTest, SplitUTF8CharacterLength3) { RunTest(test_cases); } -TEST_F(ProcessOutputWatcherTest, SplitSoleUTF8CharacterThreeWays) { +// http://crbug.com/396496 +TEST_F(ProcessOutputWatcherTest, DISABLED_SplitSoleUTF8CharacterThreeWays) { std::vector<TestCase> test_cases; test_cases.push_back(TestCase("\xe2", false, "")); test_cases.push_back(TestCase("\x82", false, "")); @@ -255,7 +259,8 @@ TEST_F(ProcessOutputWatcherTest, MulitByteUTF8CharNullTerminated) { RunTest(test_cases); } -TEST_F(ProcessOutputWatcherTest, MultipleMultiByteUTF8Characters) { +// http://crbug.com/396496 +TEST_F(ProcessOutputWatcherTest, DISABLED_MultipleMultiByteUTF8Characters) { std::vector<TestCase> test_cases; test_cases.push_back( TestCase("test\xe2\x82\xac\xc2", false, "test\xe2\x82\xac")); @@ -271,7 +276,8 @@ TEST_F(ProcessOutputWatcherTest, ContainsInvalidUTF8) { RunTest(test_cases); } -TEST_F(ProcessOutputWatcherTest, InvalidUTF8SeriesOfTrailingBytes) { +// http://crbug.com/396496 +TEST_F(ProcessOutputWatcherTest, DISABLED_InvalidUTF8SeriesOfTrailingBytes) { std::vector<TestCase> test_cases; test_cases.push_back(TestCase("\x82\x82\x82", false, "\x82\x82\x82")); test_cases.push_back(TestCase("\x82\x82\x82", false, "\x82\x82\x82")); @@ -286,7 +292,8 @@ TEST_F(ProcessOutputWatcherTest, EndsWithInvalidUTF8) { RunTest(test_cases); } -TEST_F(ProcessOutputWatcherTest, FourByteUTF8) { +// http://crbug.com/396496 +TEST_F(ProcessOutputWatcherTest, DISABLED_FourByteUTF8) { std::vector<TestCase> test_cases; test_cases.push_back(TestCase("\xf0\xa4\xad", false, "")); test_cases.push_back(TestCase("\xa2", false, "\xf0\xa4\xad\xa2")); @@ -296,7 +303,8 @@ TEST_F(ProcessOutputWatcherTest, FourByteUTF8) { // Verifies that sending '\0' generates PROCESS_OUTPUT_TYPE_OUT event and does // not terminate output watcher. -TEST_F(ProcessOutputWatcherTest, SendNull) { +// http://crbug.com/396496 +TEST_F(ProcessOutputWatcherTest, DISABLED_SendNull) { std::vector<TestCase> test_cases; // This will send '\0' to output watcher. test_cases.push_back(TestCase("", true)); diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc index 442a6b9..0ae1341 100644 --- a/content/browser/service_worker/service_worker_browsertest.cc +++ b/content/browser/service_worker/service_worker_browsertest.cc @@ -742,8 +742,8 @@ static int CountRenderProcessHosts() { return result; } -// Crashes on Android: http://crbug.com/387045 -#if defined(OS_ANDROID) +// Crashes on Android and flakes on CrOS: http://crbug.com/387045 +#if defined(OS_ANDROID) || defined(OS_CHROMEOS) #define MAYBE_Registration DISABLED_Registration #else #define MAYBE_Registration Registration diff --git a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc index e63ce5a..a44174e 100644 --- a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc +++ b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc @@ -312,8 +312,14 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, EXPECT_STREQ("Some", selection.c_str()); } +#if defined(OS_CHROMEOS) +// http://crbug.com/396509 +#define MAYBE_TouchCursorInTextfieldTest DISABLED_TouchCursorInTextfieldTest +#else +#define MAYBE_TouchCursorInTextfieldTest TouchCursorInTextfieldTest +#endif IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, - TouchCursorInTextfieldTest) { + MAYBE_TouchCursorInTextfieldTest) { ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html")); WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(shell()->web_contents()); diff --git a/ui/wm/core/nested_accelerator_controller_unittest.cc b/ui/wm/core/nested_accelerator_controller_unittest.cc index 9fa394e..d0a3688 100644 --- a/ui/wm/core/nested_accelerator_controller_unittest.cc +++ b/ui/wm/core/nested_accelerator_controller_unittest.cc @@ -155,7 +155,8 @@ class NestedAcceleratorTest : public aura::test::AuraTestBase { } // namespace // Aura window above lock screen in z order. -TEST_F(NestedAcceleratorTest, AssociatedWindowAboveLockScreen) { +// http://crbug.com/396494 +TEST_F(NestedAcceleratorTest, DISABLED_AssociatedWindowAboveLockScreen) { // TODO(oshima|sadrul): remove when Win implements PES. if (!ui::PlatformEventSource::GetInstance()) return; @@ -180,7 +181,8 @@ TEST_F(NestedAcceleratorTest, AssociatedWindowAboveLockScreen) { } // Test that the nested dispatcher handles accelerators. -TEST_F(NestedAcceleratorTest, AcceleratorsHandled) { +// http://crbug.com/396494 +TEST_F(NestedAcceleratorTest, DISABLED_AcceleratorsHandled) { // TODO(oshima|sadrul): remove when Win implements PES. if (!ui::PlatformEventSource::GetInstance()) return; |