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

1 files changed, 11 insertions, 2 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);
 }