Flakiness cleanup: disable flaky tests under chrome/test/

chrome/test/perf/startup_test.cc

 // 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.
 
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 325 matching lines @@
     new_launch_arguments.AppendSwitchASCII(switches::kRestoreLastSession,
                                         base::IntToString(tab_count));
     launch_arguments_ = new_launch_arguments;
   }
   RunStartupTest(graph, trace, WARM, NOT_IMPORTANT,
                  UITestBase::DEFAULT_THEME, tab_count, nth_timed_tab);
 }
 
 // http://crbug.com/101591
 #if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_PerfFewTabs FLAKY_PerfFewTabs
+#define MAYBE_PerfFewTabs DISABLED_PerfFewTabs
 #else
 #define MAYBE_PerfFewTabs PerfFewTabs
 #endif
 
 TEST_F(StartupTest, MAYBE_PerfFewTabs) {
   RunPerfTestWithManyTabs("few_tabs", "cmdline", 5, 2, false);
 }
 
 TEST_F(StartupTest, PerfFewTabsReference) {
   UseReferenceBuild();
   RunPerfTestWithManyTabs("few_tabs", "cmdline-ref", 5, 2, false);
 }
 
 TEST_F(StartupTest, PerfRestoreFewTabs) {
   RunPerfTestWithManyTabs("few_tabs", "restore", 5, 2, true);
 }
 
 TEST_F(StartupTest, PerfRestoreFewTabsReference) {
   UseReferenceBuild();
   RunPerfTestWithManyTabs("few_tabs", "restore-ref", 5, 2, true);
 }
 
 #if defined(OS_MACOSX)
 // http://crbug.com/46609
-#define MAYBE_PerfSeveralTabsReference FLAKY_PerfSeveralTabsReference
-#define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs
+#define MAYBE_PerfSeveralTabsReference DISABLED_PerfSeveralTabsReference
+#define MAYBE_PerfSeveralTabs DISABLED_PerfSeveralTabs
 // http://crbug.com/52858
-#define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs
-#define MAYBE_PerfExtensionContentScript50 FLAKY_PerfExtensionContentScript50
+#define MAYBE_PerfRestoreSeveralTabs DISABLED_PerfRestoreSeveralTabs
+#define MAYBE_PerfExtensionContentScript50 DISABLED_PerfExtensionContentScript50
 #elif defined(OS_WIN)
 // http://crbug.com/46609
 #if !defined(NDEBUG)
 // http://crbug.com/102584
 #define MAYBE_PerfSeveralTabs DISABLED_PerfSeveralTabs
 #else
-#define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs
+#define MAYBE_PerfSeveralTabs DISABLED_PerfSeveralTabs
 #endif
 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference
 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50
 #else
 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference
 #define MAYBE_PerfSeveralTabs PerfSeveralTabs
 #define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
 #define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50
 #endif
 
 // http://crbug.com/99604
 #if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_PerfComplexTheme FLAKY_PerfComplexTheme
+#define MAYBE_PerfComplexTheme DISABLED_PerfComplexTheme
 #else
 #define MAYBE_PerfComplexTheme PerfComplexTheme
 #endif
 
 TEST_F(StartupTest, MAYBE_PerfSeveralTabs) {
   RunPerfTestWithManyTabs("several_tabs", "cmdline", 10, 4, false);
 }
 
 TEST_F(StartupTest, MAYBE_PerfSeveralTabsReference) {
   UseReferenceBuild();
@@ skipping 46 matching lines @@
                  UITestBase::CUSTOM_FRAME, 0, 0);
 }
 
 TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
   RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
                  UITestBase::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
 }
 #endif
 
 }  // namespace