diff options
| -rw-r--r-- | chrome_frame/test/automation_client_mock.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/ui_test.cc | 2 | ||||
| -rw-r--r-- | media/filters/video_renderer_base_unittest.cc | 2 | ||||
| -rw-r--r-- | sandbox/src/unload_dll_test.cc | 4 | ||||
| -rw-r--r-- | ui/views/view_unittest.cc | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc index f3a7c1a..c1c927d 100644 --- a/chrome_frame/test/automation_client_mock.cc +++ b/chrome_frame/test/automation_client_mock.cc @@ -150,7 +150,7 @@ TEST(CFACWithChrome, CreateNotSoFast) { } // FLAKY: 114386. -TEST(CFACWithChrome, FLAKY_NavigateOk) { +TEST(CFACWithChrome, DISABLED_NavigateOk) { MockCFDelegate cfd; NavigationConstraintsImpl navigation_constraints; @@ -199,7 +199,7 @@ TEST(CFACWithChrome, FLAKY_NavigateOk) { } // FLAKY: 114386. -TEST(CFACWithChrome, FLAKY_NavigateFailed) { +TEST(CFACWithChrome, DISABLED_NavigateFailed) { MockCFDelegate cfd; NavigationConstraintsImpl navigation_constraints; chrome_frame_test::TimedMsgLoop loop; diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index 7603e96..27fbc07 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -708,7 +708,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_AnchorUrlNavigateTest) { // Test whether POST-ing a form from an mshtml page to a CF page will cause // the request to get reissued. It should not. // FLAKY: 114386. -TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_TestPostReissue) { +TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_TestPostReissue) { // The order of pages in this array is assumed to be mshtml, cf, script. const wchar_t* kPages[] = { L"full_tab_post_mshtml.html", diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index 6e8b1a2..c594a8f 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -804,7 +804,7 @@ TEST_F(ContextMenuTest, CFTxtFieldCut) { // Test CF text field context menu - copy. // FLAKY: 114386. -TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCopy) { +TEST_F(ContextMenuTest, DISABLED_CFTxtFieldCopy) { server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag()); AccObjectMatcher txtfield_matcher(L"", L"editable text"); diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc index 0bd06e5..eb0be39 100644 --- a/media/filters/video_renderer_base_unittest.cc +++ b/media/filters/video_renderer_base_unittest.cc @@ -457,7 +457,7 @@ TEST_F(VideoRendererBaseTest, GetCurrentFrame_Flushed) { #if defined(OS_MACOSX) // http://crbug.com/109405 -#define MAYBE_GetCurrentFrame_EndOfStream FLAKY_GetCurrentFrame_EndOfStream +#define MAYBE_GetCurrentFrame_EndOfStream DISABLED_GetCurrentFrame_EndOfStream #else #define MAYBE_GetCurrentFrame_EndOfStream GetCurrentFrame_EndOfStream #endif diff --git a/sandbox/src/unload_dll_test.cc b/sandbox/src/unload_dll_test.cc index 11ccc56..bf09c5c 100644 --- a/sandbox/src/unload_dll_test.cc +++ b/sandbox/src/unload_dll_test.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. @@ -72,7 +72,7 @@ TEST(UnloadDllTest, UnloadAviCapDllNoPatching) { } // Flaky: http://crbug.com/38404 -TEST(UnloadDllTest, FLAKY_UnloadAviCapDllWithPatching) { +TEST(UnloadDllTest, DISABLED_UnloadAviCapDllWithPatching) { TestRunner runner; runner.SetTimeout(2000); runner.SetTestState(BEFORE_REVERT); diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index a063c14..4cb0d5c 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -2930,7 +2930,7 @@ TEST_F(ViewLayerTest, VisibilityChildLayers) { // This test creates a random View tree, and then randomly reorders child views, // reparents views etc. Unrelated changes can appear to break this test. So // marking this as FLAKY. -TEST_F(ViewLayerTest, FLAKY_ViewLayerTreesInSync) { +TEST_F(ViewLayerTest, DISABLED_ViewLayerTreesInSync) { View* content = new View; content->SetPaintToLayer(true); widget()->SetContentsView(content); |