Flakiness cleanup: disable flaky tests under chrome_frame/

See https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/fcec09fc659f39a6

BUG=81479,83133,37088,32321,111074,114058,90791,83114,64794


Review URL: http://codereview.chromium.org/9391011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121919 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 13 insertions, 12 deletions

diff --git a/chrome_frame/test/chrome_frame_automation_mock.cc b/chrome_frame/test/chrome_frame_automation_mock.cc
index 966a176..5dce4df 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.cc
+++ b/chrome_frame/test/chrome_frame_automation_mock.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.
 
@@ -12,7 +12,7 @@ const int kShortWaitTimeout = 5 * 1000;
 // This test has been marked as flaky as it randomly times out on the CF
 // builders
 // http://code.google.com/p/chromium/issues/detail?id=81479
-TEST(ChromeFrame, FLAKY_Launch) {
+TEST(ChromeFrame, DISABLED_Launch) {
   MessageLoopForUI loop;
   AutomationMockLaunch mock_launch(&loop, kLongWaitTimeout);
 
@@ -47,7 +47,7 @@ TEST(ChromeFrame, PostMessage) {
 
 // Marking this test as flaky as it fails randomly on the CF builders.
 // http://code.google.com/p/chromium/issues/detail?id=81479
-TEST(ChromeFrame, FLAKY_RequestStart) {
+TEST(ChromeFrame, DISABLED_RequestStart) {
   MessageLoopForUI loop;
   AutomationMockHostNetworkRequestStart mock_request_start(&loop,
                                                            kLongWaitTimeout);
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc
index 90ecfb2..ddb451f 100644
--- a/chrome_frame/test/navigation_test.cc
+++ b/chrome_frame/test/navigation_test.cc
@@ -125,7 +125,7 @@ TEST_P(FullTabNavigationTest, Refresh) {
 
 // Test that multiple back and forward requests work.
 // TODO(tsepez): http://crbug.com/83133
-TEST_P(FullTabNavigationTest, FLAKY_MultipleBackForward) {
+TEST_P(FullTabNavigationTest, DISABLED_MultipleBackForward) {
   std::wstring page1 = GetSimplePageUrl();
   std::wstring page2 = GetLinkPageUrl();
   std::wstring page3 = GetAnchorPageUrl(0);
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index fc758dd..4a4fa17 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -418,7 +418,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_iframeBasic) {
 
 const wchar_t kSrcPropertyTestPage[] = L"src_property_host.html";
 
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_SrcProperty) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_SrcProperty) {
   SimpleBrowserTest(IE, kSrcPropertyTestPage);
 }
 
@@ -443,7 +443,7 @@ TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_CFInstanceDelay) {
 const wchar_t kCFIFallbackPage[] = L"CFInstance_fallback_host.html";
 
 // http://crbug.com/37088
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_CFInstanceFallback) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_CFInstanceFallback) {
   SimpleBrowserTest(IE, kCFIFallbackPage);
 }
 
@@ -470,7 +470,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceZeroSize) {
 const wchar_t kCFIIfrPostPage[] = L"CFInstance_iframe_post_host.html";
 
 // http://crbug.com/32321
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_CFInstanceIfrPost) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_CFInstanceIfrPost) {
   SimpleBrowserTest(IE, kCFIIfrPostPage);
 }
 
@@ -786,7 +786,7 @@ const wchar_t kWindowCloseTestUrl[] =
     L"window_close.html";
 
 // http://code.google.com/p/chromium/issues/detail?id=111074
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_WindowClose) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_WindowClose) {
   SimpleBrowserTest(IE, kWindowCloseTestUrl);
 }
 
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index 8446ab6..957f36c 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -67,7 +67,8 @@ TEST_P(FullTabUITest, KeyboardInput) {
 }
 
 // Tests keyboard shortcuts for back and forward.
-TEST_P(FullTabUITest, FLAKY_KeyboardBackForward) {
+// http://code.google.com/p/chromium/issues/detail?id=114058
+TEST_P(FullTabUITest, DISABLED_KeyboardBackForward) {
   if (IsWorkstationLocked()) {
     LOG(ERROR) << "This test cannot be run in a locked workstation.";
     return;
@@ -238,7 +239,7 @@ TEST_P(FullTabUITest, AltD) {
 
 // Tests that the renderer has focus after navigation.
 // Flaky, see http://crbug.com/90791 .
-TEST_P(FullTabUITest, FLAKY_RendererHasFocus) {
+TEST_P(FullTabUITest, DISABLED_RendererHasFocus) {
   EXPECT_CALL(ie_mock_, OnLoad(GetParam().invokes_cf(),
                                StrEq(GetSimplePageUrl())))
       .WillOnce(testing::DoAll(
@@ -588,7 +589,7 @@ TEST_F(ContextMenuTest, CFInspector) {
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=83114
-TEST_F(ContextMenuTest, FLAKY_CFSavePageAs) {
+TEST_F(ContextMenuTest, DISABLED_CFSavePageAs) {
   // Please see http://code.google.com/p/chromium/issues/detail?id=60987
   // for more information on why this test is disabled for Vista with IE7.
   if (base::win::GetVersion() == base::win::VERSION_VISTA &&
@@ -737,7 +738,7 @@ TEST_F(ContextMenuTest, IEBackForward) {
 
 // Test CF link context menu - Open link in new window.
 // Failing intermittently on IE6/7. See crbug.com/64794.
-TEST_F(ContextMenuTest, FLAKY_CFOpenLinkInNewWindow) {
+TEST_F(ContextMenuTest, DISABLED_CFOpenLinkInNewWindow) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   MockIEEventSink new_window_mock;
   new_window_mock.ExpectAnyNavigations();