Mark a bunch of startup_tests as FLAKY on Mac.

chrome/test/startup/startup_test.cc

 // Copyright (c) 2010 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/platform_thread.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 279 matching lines @@
 
 TEST_F(StartupTest, 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) {
+// http://crbug.com/52858
+#if defined(OS_MACOSX)
+#define MAYBE_PerfRestoreFewTabs FLAKY_PerfRestoreFewTabs
+#else
+#define MAYBE_PerfRestoreFewTabs PerfRestoreFewTabs
+#endif
+TEST_F(StartupTest, MAYBE_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
-#if defined(OS_MACOSX)
 #define MAYBE_PerfSeveralTabsReference FLAKY_PerfSeveralTabsReference
 #define MAYBE_PerfSeveralTabs FLAKY_PerfSeveralTabs
+// http://crbug.com/52858
+#define MAYBE_PerfRestoreSeveralTabs FLAKY_PerfRestoreSeveralTabs
+#define MAYBE_PerfExtensionContentScript50 FLAKY_PerfExtensionContentScript50
 #else
 #define MAYBE_PerfSeveralTabsReference PerfSeveralTabsReference
 #define MAYBE_PerfSeveralTabs PerfSeveralTabs
+#define MAYBE_PerfRestoreSeveralTabs PerfRestoreSeveralTabs
+#define MAYBE_PerfExtensionContentScript50 PerfExtensionContentScript50
 #endif
 
 TEST_F(StartupTest, MAYBE_PerfSeveralTabs) {
   RunPerfTestWithManyTabs("several_tabs", "cmdline", 10, 4, false);
 }
 
 TEST_F(StartupTest, MAYBE_PerfSeveralTabsReference) {
   UseReferenceBuild();
   RunPerfTestWithManyTabs("several_tabs", "cmdline-ref", 10, 4, false);
 }
 
-TEST_F(StartupTest, PerfRestoreSeveralTabs) {
+TEST_F(StartupTest, MAYBE_PerfRestoreSeveralTabs) {
   RunPerfTestWithManyTabs("several_tabs", "restore", 10, 4, true);
 }
 
 TEST_F(StartupTest, PerfRestoreSeveralTabsReference) {
   UseReferenceBuild();
   RunPerfTestWithManyTabs("several_tabs", "restore-ref", 10, 4, true);
 }
 
 TEST_F(StartupTest, PerfExtensionEmpty) {
   SetUpWithFileURL();
   SetUpWithExtensionsProfile("empty");
   RunStartupTest("warm", "extension_empty", WARM, NOT_IMPORTANT,
                  UITest::DEFAULT_THEME, 1, 0);
 }
 
 TEST_F(StartupTest, PerfExtensionContentScript1) {
   SetUpWithFileURL();
   SetUpWithExtensionsProfile("content_scripts1");
   RunStartupTest("warm", "extension_content_scripts1", WARM, NOT_IMPORTANT,
                  UITest::DEFAULT_THEME, 1, 0);
 }
 
-TEST_F(StartupTest, PerfExtensionContentScript50) {
+TEST_F(StartupTest, MAYBE_PerfExtensionContentScript50) {
   SetUpWithFileURL();
   SetUpWithExtensionsProfile("content_scripts50");
   RunStartupTest("warm", "extension_content_scripts50", WARM, NOT_IMPORTANT,
                  UITest::DEFAULT_THEME, 1, 0);
 }
 
 #if defined(OS_WIN)
 // TODO(port): Enable gears tests on linux/mac once gears is working.
 TEST_F(StartupTest, PerfGears) {
   SetUpWithFileURL();
@@ skipping 24 matching lines @@
                  UITest::CUSTOM_FRAME, 0, 0);
 }
 
 TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
   RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
                  UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
 }
 #endif
 
 }  // namespace