Mark a bunch of startup_tests as FLAKY on Mac:

* ShutdownTest.SimpleSessionEnding
* ShutdownTest.TwentyTabsUserQuit
* StartupTest.PerfRestoreFewTabs
* StartupTest.PerfRestoreSeveralTabs
* StartupTest.PerfExtensionContentScript50

R=thomasvl
BUG=44067,52858
TEST=startup_tests

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

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

2 files changed, 26 insertions, 6 deletions

diff --git a/chrome/test/startup/shutdown_test.cc b/chrome/test/startup/shutdown_test.cc
index a7a0722..863b066 100644
--- a/chrome/test/startup/shutdown_test.cc
+++ b/chrome/test/startup/shutdown_test.cc
@@ -123,7 +123,16 @@ TEST_F(ShutdownTest, SimpleUserQuit) {
                   true, /* important */ SIMPLE, UITest::USER_QUIT);
 }
 
-TEST_F(ShutdownTest, SimpleSessionEnding) {
+// http://crbug.com/52858
+#if defined(OS_MACOSX)
+#define MAYBE_SimpleSessionEnding FLAKY_SimpleSessionEnding
+#define MAYBE_TwentyTabsUserQuit FLAKY_TwentyTabsUserQuit
+#else
+#define MAYBE_SimpleSessionEnding SimpleSessionEnding
+#define MAYBE_TwentyTabsUserQuit TwentyTabsUserQuit
+#endif
+
+TEST_F(ShutdownTest, MAYBE_SimpleSessionEnding) {
   RunShutdownTest("shutdown", "simple-session-ending",
                   true, /* important */ SIMPLE, UITest::SESSION_ENDING);
 }
@@ -133,7 +142,7 @@ TEST_F(ShutdownTest, TwentyTabsWindowClose) {
                   true, /* important */ TWENTY_TABS, UITest::WINDOW_CLOSE);
 }
 
-TEST_F(ShutdownTest, TwentyTabsUserQuit) {
+TEST_F(ShutdownTest, MAYBE_TwentyTabsUserQuit) {
   RunShutdownTest("shutdown", "twentytabs-user-quit",
                   true, /* important */ TWENTY_TABS, UITest::USER_QUIT);
 }
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index d2bff3d..54c327e 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -297,7 +297,13 @@ TEST_F(StartupTest, PerfFewTabsReference) {
   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);
 }
 
@@ -306,13 +312,18 @@ TEST_F(StartupTest, PerfRestoreFewTabsReference) {
   RunPerfTestWithManyTabs("few_tabs", "restore-ref", 5, 2, true);
 }
 
-// http://crbug.com/46609
 #if defined(OS_MACOSX)
+// http://crbug.com/46609
 #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) {
@@ -324,7 +335,7 @@ TEST_F(StartupTest, MAYBE_PerfSeveralTabsReference) {
   RunPerfTestWithManyTabs("several_tabs", "cmdline-ref", 10, 4, false);
 }
 
-TEST_F(StartupTest, PerfRestoreSeveralTabs) {
+TEST_F(StartupTest, MAYBE_PerfRestoreSeveralTabs) {
   RunPerfTestWithManyTabs("several_tabs", "restore", 10, 4, true);
 }
 
@@ -347,7 +358,7 @@ TEST_F(StartupTest, PerfExtensionContentScript1) {
                  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,