Mark Tulip as flaky on Mac.

content/browser/media_browsertest.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/basictypes.h"
 #include "base/command_line.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 120 matching lines @@
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) {
   PlayAudio("bear_gsm_ms.wav", GetParam());
 }
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) {
   PlayAudio("bear_mulaw.wav", GetParam());
 }
 
 // TODO(dalecurtis): Fails seek test.  http://crbug.com/141020
-// IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) {
-//   PlayAudio("bear.flac", GetParam());
-// }
+IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearFlac) {
+  PlayAudio("bear.flac", GetParam());
+}
 #endif
 #endif
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) {
   PlayAudio("bear_pcm.wav", GetParam());
 }
 
-// Flaky. http://crbug.com/143151
+#if defined(OS_MACOSX)
+// TODO(dalecurtis): Flaky on Mac 10.6.  http://crbug.com/142896
 IN_PROC_BROWSER_TEST_P(MediaTest, FLAKY_VideoTulipWebm) {
   PlayVideo("tulip2.webm", GetParam());
 }
+#else
+IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) {
+  PlayVideo("tulip2.webm", GetParam());
+}
+#endif
 
 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
 
 class MediaLayoutTest : public InProcessBrowserLayoutTest {
  protected:
   MediaLayoutTest() : InProcessBrowserLayoutTest(
       FilePath(), FilePath().AppendASCII("media")) {
   }
   virtual ~MediaLayoutTest() {}
@@ skipping 30 matching lines @@
   RunLayoutTest("video-autoplay.html");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) {
   RunLayoutTest("video-loop.html");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) {
   RunLayoutTest("video-no-autoplay.html");
 }