GTTF: No more FLAKY_ .

Please note that FLAKY_ tests have been ignored anyway. When tests started
crashing, people just flipped that to DISABLED_ . Why not go straight to
DISABLED_ then, so that we avoid wasting time on stupid test prefix games?

With DISABLED_ it is clear to everyone that there is no coverage from given
test. FLAKY_ creates an illusion of coverage, while in fact the test is still
ignored.

If a FLAKY_ test fails and nobody notices, does it still make a sound? ;-)

Finally, note that gtest has a --gtest_also_run_disabled_tests if you need
to run tests manually.

TBR=jam

BUG=none

Review URL: https://codereview.chromium.org/11664013

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

3 files changed, 22 insertions, 21 deletions

diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc
index a61ae92..f6c287a 100644
--- a/chrome_frame/test/navigation_test.cc
+++ b/chrome_frame/test/navigation_test.cc
@@ -600,7 +600,7 @@ class NavigationTest : public MockIEEventSinkTest, public testing::Test {
 
 // Test navigation to a disallowed gcf: url with file scheme.
 // Times out sporadically; http://crbug.com/119718.
-TEST_F(NavigationTest, FLAKY_GcfProtocol1) {
+TEST_F(NavigationTest, DISABLED_GcfProtocol1) {
   // Make sure that we are not accidently enabling gcf protocol.
   SetConfigBool(kAllowUnsafeURLs, false);
   TestDisAllowedUrl(L"gcf:file:///C:/");
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index b43b4d7..277675a 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -464,7 +464,8 @@ const wchar_t kNavigateURLRelativePage[] =
     L"navigateurl_relative_host.html";
 
 // Flaky, crbug.com/160497.
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_NavigateURLRelative) {
+TEST_F(ChromeFrameTestWithWebServer,
+       DISABLED_WidgetModeIE_NavigateURLRelative) {
   SimpleBrowserTest(IE, kNavigateURLRelativePage);
 }
 
@@ -478,7 +479,7 @@ const wchar_t kiframeBasicPage[] = L"iframe_basic_host.html";
 
 
 // Flaky, crbug.com/160497.
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_iframeBasic) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_iframeBasic) {
   SimpleBrowserTest(IE, kiframeBasicPage);
 }
 
@@ -515,7 +516,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceFallback) {
 const wchar_t kCFINoSrcPage[] = L"CFInstance_no_src_host.html";
 
 // Flaky, crbug.com/160497.
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_CFInstanceNoSrc) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_CFInstanceNoSrc) {
   SimpleBrowserTest(IE, kCFINoSrcPage);
 }
 
@@ -647,7 +648,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFHttpHeaderFrameSet) {
 const wchar_t kVersionPage[] = L"version.html";
 
 // Flaky, crbug.com/160497.
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_WidgetModeIE_Version) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_WidgetModeIE_Version) {
   VersionTest(IE, kVersionPage);
 }
 
@@ -665,7 +666,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_PrivilegedApis) {
 
 const wchar_t kMetaTagPage[] = L"meta_tag.html";
 // Flaky, crbug.com/160497.
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_MetaTag) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_MetaTag) {
   SimpleBrowserTest(IE, kMetaTagPage);
 }
 
@@ -710,7 +711,7 @@ const wchar_t kXMLHttpRequestTestUrl[] =
     L"xmlhttprequest_test.html";
 
 // Flaky, crbug.com/160497.
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_XHRTest) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_XHRTest) {
   SimpleBrowserTest(IE, kXMLHttpRequestTestUrl);
 }
 
@@ -750,7 +751,7 @@ const wchar_t kXHRHeaderTestUrl[] =
     L"xmlhttprequest_header_test.html";
 
 // Marking as flaky since it occasionally times out. crbug.com/127395.
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_XHRHeaderTest) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_XHRHeaderTest) {
   SimpleBrowserTest(IE, kXHRHeaderTestUrl);
 }
 
@@ -771,7 +772,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.
 // https://code.google.com/p/chromium/issues/detail?id=143699
-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",
@@ -803,7 +804,7 @@ TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_TestPostReissue) {
 // Test whether following a link from an mshtml page to a CF page will cause
 // multiple network requests.  It should not.
 // Flaky, crbug.com/160497.
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabModeIE_TestMultipleGet) {
+TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_TestMultipleGet) {
   // The order of pages in this array is assumed to be mshtml, cf, script.
   const wchar_t* kPages[] = {
     L"full_tab_get_mshtml.html",
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index 9d10363..bbcb4ca 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -114,7 +114,7 @@ TEST_P(FullTabUITest, DISABLED_KeyboardBackForward) {
 
 // Tests new window behavior with ctrl+N.
 // Flaky due to DelaySendChar; see http://crbug.com/124244.
-TEST_P(FullTabUITest, FLAKY_CtrlN) {
+TEST_P(FullTabUITest, DISABLED_CtrlN) {
   if (IsWorkstationLocked()) {
     LOG(ERROR) << "This test cannot be run in a locked workstation.";
     return;
@@ -156,7 +156,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlN) {
 
 // Test that Ctrl+F opens the Find dialog.
 // Flaky due to DelaySendChar; see http://crbug.com/124244.
-TEST_P(FullTabUITest, FLAKY_CtrlF) {
+TEST_P(FullTabUITest, DISABLED_CtrlF) {
   if (IsWorkstationLocked()) {
     LOG(ERROR) << "This test cannot be run in a locked workstation.";
     return;
@@ -190,7 +190,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlF) {
 
 // Test that ctrl+r does cause a refresh.
 // Flaky due to DelaySendChar; see http://crbug.com/124244.
-TEST_P(FullTabUITest, FLAKY_CtrlR) {
+TEST_P(FullTabUITest, DISABLED_CtrlR) {
   if (IsWorkstationLocked()) {
     LOG(ERROR) << "This test cannot be run in a locked workstation.";
     return;
@@ -219,7 +219,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlR) {
 
 // Test window close with ctrl+w.
 // Flaky due to DelaySendChar; see http://crbug.com/124244.
-TEST_P(FullTabUITest, FLAKY_CtrlW) {
+TEST_P(FullTabUITest, DISABLED_CtrlW) {
   if (IsWorkstationLocked()) {
     LOG(ERROR) << "This test cannot be run in a locked workstation.";
     return;
@@ -240,7 +240,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlW) {
 
 // Test address bar navigation with Alt+d and URL.
 // Flaky due to TypeUrlInAddressBar; see http://crbug.com/124244.
-TEST_P(FullTabUITest, FLAKY_AltD) {
+TEST_P(FullTabUITest, DISABLED_AltD) {
   if (IsWorkstationLocked()) {
     LOG(ERROR) << "This test cannot be run in a locked workstation.";
     return;
@@ -809,7 +809,7 @@ TEST_F(ContextMenuTest, CFCopyLinkAddress) {
 
 // Test CF text field context menu - cut.
 // Times out sporadically http://crbug.com/119660.
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCut) {
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldCut) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   AccObjectMatcher txtfield_matcher(L"", L"editable text");
 
@@ -833,7 +833,7 @@ TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCut) {
 
 // Test CF text field context menu - copy.
 // Times out sporadically http://crbug.com/119660.
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCopy) {
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldCopy) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   AccObjectMatcher txtfield_matcher(L"", L"editable text");
 
@@ -859,7 +859,7 @@ TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCopy) {
 
 // Test CF text field context menu - paste.
 // Times out sporadically http://crbug.com/119660.
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldPaste) {
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldPaste) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   AccObjectMatcher txtfield_matcher(L"", L"editable text");
 
@@ -883,7 +883,7 @@ TEST_F(ContextMenuTest, FLAKY_CFTxtFieldPaste) {
 
 // Test CF text field context menu - delete.
 // Times out sporadically http://crbug.com/119660.
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldDelete) {
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldDelete) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   AccObjectMatcher txtfield_matcher(L"", L"editable text");
 
@@ -925,7 +925,7 @@ TEST_F(ContextMenuTest, DISABLED_CFTxtFieldSelectAll) {
 
 // Test CF text field context menu - undo.
 // Times out sporadically http://crbug.com/119660.
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldUndo) {
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldUndo) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   AccObjectMatcher txtfield_matcher(L"", L"editable text");
 
@@ -953,7 +953,7 @@ TEST_F(ContextMenuTest, FLAKY_CFTxtFieldUndo) {
 
 // Test CF text field context menu - redo.
 // Times out sporadically http://crbug.com/119660.
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldRedo) {
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldRedo) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   AccObjectMatcher txtfield_matcher(L"", L"editable text");
   InSequence expect_in_sequence_for_scope;