Flakiness cleanup: disable flaky tests under content/

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

BUG=101984,54717,104950,102641,73776,70773,104306,62595,62776,80596,100823,96435,80466,30021,101996,34996,48664,36800,59786,70861,69881,48148,113510,77442


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

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

8 files changed, 33 insertions, 39 deletions

diff --git a/content/browser/accessibility/renderer_accessibility_browsertest.cc b/content/browser/accessibility/renderer_accessibility_browsertest.cc
index 8a07a7b..dadf884 100644
--- a/content/browser/accessibility/renderer_accessibility_browsertest.cc
+++ b/content/browser/accessibility/renderer_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.
 
@@ -124,7 +124,7 @@ bool RendererAccessibilityBrowserTest::GetBoolAttr(
 
 // Marked flaky per http://crbug.com/101984
 IN_PROC_BROWSER_TEST_F(RendererAccessibilityBrowserTest,
-                       FLAKY_CrossPlatformWebpageAccessibility) {
+                       DISABLED_CrossPlatformWebpageAccessibility) {
   // Create a data url and load it.
   const char url_str[] =
       "data:text/html,"
diff --git a/content/browser/appcache/appcache_ui_test.cc b/content/browser/appcache/appcache_ui_test.cc
index 29b2136..84dfbb3 100644
--- a/content/browser/appcache/appcache_ui_test.cc
+++ b/content/browser/appcache/appcache_ui_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.
 
@@ -71,7 +71,7 @@ TEST_F(AppCacheUITest, DISABLED_AppCacheLayoutTests_NoPHP) {
 
 // Flaky: http://crbug.com/54717
 // Lighty/PHP is not reliable enough on windows.
-TEST_F(AppCacheUITest, FLAKY_AppCacheLayoutTests_PHP) {
+TEST_F(AppCacheUITest, DISABLED_AppCacheLayoutTests_PHP) {
   static const char* kPHPTests[] = {
       "auth.html",
       "fallback.html",
diff --git a/content/browser/device_orientation/provider_unittest.cc b/content/browser/device_orientation/provider_unittest.cc
index 12ea290..6e0ad35 100644
--- a/content/browser/device_orientation/provider_unittest.cc
+++ b/content/browser/device_orientation/provider_unittest.cc
@@ -247,12 +247,10 @@ TEST_F(DeviceOrientationProviderTest, MultipleObserversPushTest) {
   provider_->RemoveObserver(checker_c.get());
 }
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_WIN)
 // Flakily DCHECKs on Linux. See crbug.com/104950.
-#define MAYBE_ObserverNotRemoved DISABLED_ObserverNotRemoved
-#elif defined(OS_WIN)
 // FLAKY on Win. See crbug.com/104950.
-#define MAYBE_ObserverNotRemoved FLAKY_ObserverNotRemoved
+#define MAYBE_ObserverNotRemoved DISABLED_ObserverNotRemoved
 #else
 #define MAYBE_ObserverNotRemoved ObserverNotRemoved
 #endif
@@ -278,7 +276,7 @@ TEST_F(DeviceOrientationProviderTest, MAYBE_ObserverNotRemoved) {
 
 #if defined(OS_WIN)
 // FLAKY on Win. See crbug.com/104950.
-#define MAYBE_StartFailing FLAKY_StartFailing
+#define MAYBE_StartFailing DISABLED_StartFailing
 #else
 #define MAYBE_StartFailing StartFailing
 #endif
diff --git a/content/browser/in_process_webkit/dom_storage_uitest.cc b/content/browser/in_process_webkit/dom_storage_uitest.cc
index ca8b151..e4fadbc 100644
--- a/content/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/content/browser/in_process_webkit/dom_storage_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.
 
@@ -105,7 +105,7 @@ TEST_F(DOMStorageTest, FAILS_RootLayoutTests) {
 }
 
 // Flakily fails on all platforms.  http://crbug.com/102641
-TEST_F(DOMStorageTest, FLAKY_EventLayoutTests) {
+TEST_F(DOMStorageTest, DISABLED_EventLayoutTests) {
   InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("events"),
                           kNoHttpPort);
   AddJSTestResources();
@@ -191,7 +191,7 @@ TEST_F(DomStorageEmptyDatabaseTest, EmptyDirAfterGet) {
 }
 
 // Flaky, see http://crbug.com/73776
-TEST_F(DomStorageEmptyDatabaseTest, FLAKY_NonEmptyDirAfterSet) {
+TEST_F(DomStorageEmptyDatabaseTest, DISABLED_NonEmptyDirAfterSet) {
   NavigateToURL(TestUrl());
   ASSERT_TRUE(StorageDirIsEmpty());
 
diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc
index 56de45f..003d4b5 100644
--- a/content/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -102,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionTest) {
 }
 
 // Flaky: http://crbug.com/70773
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_DoesntHangTest) {
+IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_DoesntHangTest) {
   SimpleTest(testUrl(FilePath(
       FILE_PATH_LITERAL("transaction_run_forever.html"))));
   ui_test_utils::CrashTab(browser()->GetSelectedWebContents());
diff --git a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
index 00dd579..8c9ee29 100644
--- a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc
@@ -104,7 +104,7 @@ TEST_F(ResourceDispatcherTest, SyncXMLHttpRequest) {
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=62776
-TEST_F(ResourceDispatcherTest, FLAKY_SyncXMLHttpRequest_Disallowed) {
+TEST_F(ResourceDispatcherTest, DISABLED_SyncXMLHttpRequest_Disallowed) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
@@ -229,7 +229,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteImmediateLoadOnunloadCookie) {
 
 #if defined(OS_WIN)
 // Seems to fail sometimes on Windows: http://crbug.com/80596
-#define MAYBE_CrossSiteNoUnloadOn204 FLAKY_CrossSiteNoUnloadOn204
+#define MAYBE_CrossSiteNoUnloadOn204 DISABLED_CrossSiteNoUnloadOn204
 #else
 #define MAYBE_CrossSiteNoUnloadOn204 CrossSiteNoUnloadOn204
 #endif
@@ -320,7 +320,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteNavigationNonBuffered) {
 // doctor page) still runs the onunload handler and can support navigations
 // away from the link doctor page.  (Bug 1235537)
 // Flaky: http://crbug.com/100823
-TEST_F(ResourceDispatcherTest, FLAKY_CrossSiteNavigationErrorPage) {
+TEST_F(ResourceDispatcherTest, DISABLED_CrossSiteNavigationErrorPage) {
   net::TestServer test_server(net::TestServer::TYPE_HTTP,
                               FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(test_server.Start());
diff --git a/content/common/hi_res_timer_manager_unittest.cc b/content/common/hi_res_timer_manager_unittest.cc
index 64cd9fa..a9fc7e1 100644
--- a/content/common/hi_res_timer_manager_unittest.cc
+++ b/content/common/hi_res_timer_manager_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.
 
@@ -10,7 +10,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
-TEST(HiResTimerManagerTest, FLAKY_ToggleOnOff) {
+// http://crbug.com/114048
+TEST(HiResTimerManagerTest, DISABLED_ToggleOnOff) {
   MessageLoop loop;
   scoped_ptr<base::SystemMonitor> system_monitor(new base::SystemMonitor());
   HighResolutionTimerManager manager;
diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc
index aa1b2eb..2ce37fb 100644
--- a/content/worker/test/worker_uitest.cc
+++ b/content/worker/test/worker_uitest.cc
@@ -185,7 +185,7 @@ TEST_F(WorkerTest, SingleSharedWorker) {
 
 // Flaky on Win XP only.  http://crbug.com/96435
 #if defined(OS_WIN)
-#define MultipleSharedWorkers FLAKY_MultipleSharedWorkers
+#define MultipleSharedWorkers DISABLED_MultipleSharedWorkers
 #endif
 TEST_F(WorkerTest, MultipleSharedWorkers) {
   RunTest(FilePath(FILE_PATH_LITERAL("multi_worker.html")), "shared=true");
@@ -193,7 +193,7 @@ TEST_F(WorkerTest, MultipleSharedWorkers) {
 
 #if defined(OS_LINUX) || defined(OS_CHROMEOS)
 // http://crbug.com/80446
-#define DISABLED_TerminateQueuedWorkers FLAKY_TerminateQueuedWorkers
+#define DISABLED_TerminateQueuedWorkers DISABLED_TerminateQueuedWorkers
 #endif
 TEST_F(WorkerTest, DISABLED_TerminateQueuedWorkers) {
   ASSERT_TRUE(WaitForProcessCountToBe(1, 0));
@@ -204,7 +204,7 @@ TEST_F(WorkerTest, DISABLED_TerminateQueuedWorkers) {
 
 #if defined(OS_LINUX)
 // http://crbug.com/30021
-#define IncognitoSharedWorkers FLAKY_IncognitoSharedWorkers
+#define IncognitoSharedWorkers DISABLED_IncognitoSharedWorkers
 #endif
 // Incognito windows should not share workers with non-incognito windows
 TEST_F(WorkerTest, IncognitoSharedWorkers) {
@@ -260,7 +260,7 @@ TEST_F(WorkerTest, DISABLED_WorkerClonePort) {
 }
 
 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
-TEST_F(WorkerTest, FLAKY_WorkerContextMultiPort) {
+TEST_F(WorkerTest, DISABLED_WorkerContextMultiPort) {
   RunWorkerFastLayoutTest("worker-context-multi-port.html");
 }
 
@@ -273,7 +273,7 @@ TEST_F(WorkerTest, WorkerMessagePortGC) {
 }
 
 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
-TEST_F(WorkerTest, FLAKY_WorkerMultiPort) {
+TEST_F(WorkerTest, DISABLED_WorkerMultiPort) {
   RunWorkerFastLayoutTest("worker-multi-port.html");
 }
 
@@ -442,7 +442,7 @@ TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) {
 }
 
 // Flaky, http://crbug.com/34996.
-TEST_F(WorkerTest, FLAKY_MessagePorts) {
+TEST_F(WorkerTest, DISABLED_MessagePorts) {
   static const char* kLayoutTestFiles[] = {
     "message-channel-gc.html",
     "message-channel-gc-2.html",
@@ -477,14 +477,9 @@ TEST_F(WorkerTest, FLAKY_MessagePorts) {
     RunLayoutTest(kLayoutTestFiles[i], kNoHttpPort);
 }
 
-#if defined(OS_MACOSX)
-// See http://crbug.com/48664
-#define MAYBE_LimitPerPage DISABLED_LimitPerPage
-#else
-// See http://crbug.com/36800 for Windows/Linux
-#define MAYBE_LimitPerPage FLAKY_LimitPerPage
-#endif
-TEST_F(WorkerTest, MAYBE_LimitPerPage) {
+// OS X: http://crbug.com/48664
+// Windows/Linux: http://crbug.com/36800
+TEST_F(WorkerTest, DISABLED_LimitPerPage) {
   int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
   GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
                                        FilePath(kManyWorkersFile));
@@ -530,7 +525,7 @@ TEST_F(WorkerTest, DISABLED_LimitTotal) {
 }
 
 // Flaky, http://crbug.com/59786.
-TEST_F(WorkerTest, FLAKY_WorkerClose) {
+TEST_F(WorkerTest, DISABLED_WorkerClose) {
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
   GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir),
@@ -543,7 +538,7 @@ TEST_F(WorkerTest, FLAKY_WorkerClose) {
 }
 
 // Flaky, http://crbug.com/70861.
-TEST_F(WorkerTest, FLAKY_QueuedSharedWorkerShutdown) {
+TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerShutdown) {
   // Tests to make sure that queued shared workers are started up when
   // shared workers shut down.
   int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
@@ -561,7 +556,7 @@ TEST_F(WorkerTest, FLAKY_QueuedSharedWorkerShutdown) {
 }
 
 // Flaky, http://crbug.com/69881.
-TEST_F(WorkerTest, FLAKY_MultipleTabsQueuedSharedWorker) {
+TEST_F(WorkerTest, DISABLED_MultipleTabsQueuedSharedWorker) {
   // Tests to make sure that only one instance of queued shared workers are
   // started up even when those instances are on multiple tabs.
   int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
@@ -595,7 +590,7 @@ TEST_F(WorkerTest, FLAKY_MultipleTabsQueuedSharedWorker) {
 }
 
 // Flaky: http://crbug.com/48148
-TEST_F(WorkerTest, FLAKY_QueuedSharedWorkerStartedFromOtherTab) {
+TEST_F(WorkerTest, DISABLED_QueuedSharedWorkerStartedFromOtherTab) {
   // Tests to make sure that queued shared workers are started up when
   // an instance is launched from another tab.
   int max_workers_per_tab = WorkerServiceImpl::kMaxWorkersPerTabWhenSeparate;
@@ -705,7 +700,7 @@ TEST_F(WorkerFileSystemTest, SyncPersistent) {
 }
 
 // http://crbug.com/113510
-TEST_F(WorkerFileSystemTest, FLAKY_AsyncOperations) {
+TEST_F(WorkerFileSystemTest, DISABLED_AsyncOperations) {
   RunWorkerFileSystemLayoutTest("async-operations.html");
 }
 
@@ -718,7 +713,7 @@ TEST_F(WorkerFileSystemTest, FileEntryToURISync) {
 }
 
 // http://crbug.com/77442
-TEST_F(WorkerFileSystemTest, FLAKY_ResolveURLHttpTests) {
+TEST_F(WorkerFileSystemTest, DISABLED_ResolveURLHttpTests) {
   static const char* kLayoutTests[] = {
     "resolve-url.html",
     "resolve-url-sync.html"
@@ -732,7 +727,7 @@ TEST_F(WorkerFileSystemTest, FLAKY_ResolveURLHttpTests) {
 #define FileFromFileEntry DISABLED_FileFromFileEntry
 #else
 // http://crbug.com/101996
-#define FileFromFileEntry FLAKY_FileFromFileEntry
+#define FileFromFileEntry DISABLED_FileFromFileEntry
 #endif
 TEST_F(WorkerFileSystemTest, FileFromFileEntry) {
   RunWorkerFileSystemLayoutTest("file-from-file-entry.html");