Tentatively reenable MediaTest.VideoTulipWebm 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 21 matching lines @@
   // Play specified video over http:// or file:// depending on |http| setting.
   void PlayVideo(const char* media_file, bool http) {
     ASSERT_NO_FATAL_FAILURE(PlayMedia("video", media_file, http));
   }
 
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // TODO(dalecurtis): Not all Buildbots have viable audio devices, so disable
     // audio to prevent tests from hanging; e.g., a device which is hardware
     // muted.  See http://crbug.com/120749
     command_line->AppendSwitch(switches::kDisableAudio);

[DaleCurtis, 2012/11/06 21:54:51]

I believe this can be removed now too since we have FakeAudioOutputStream. Want
to do that here?

[scherkus (not reviewing), 2012/11/06 21:57:04]

Can you make that change in case it has unbeknownst audio-related fallout? You
can even TBR=scherkus it!

   }
 
  private:
   GURL GetTestURL(const char* tag, const char* media_file, bool http) {
     if (http) {
       return test_server()->GetURL(
           base::StringPrintf("files/media/player.html?%s=%s", tag, media_file));
     }
 
     FilePath test_file_path = GetTestFilePath("media", "player.html");
@@ skipping 88 matching lines @@
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) {
   PlayAudio("bear.flac", GetParam());
 }
 #endif
 #endif
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) {
   PlayAudio("bear_pcm.wav", GetParam());
 }
 
-#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() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     InProcessBrowserLayoutTest::SetUpCommandLine(command_line);
     // TODO(dalecurtis): Not all Buildbots have viable audio devices, so disable
     // audio to prevent tests from hanging; e.g., a device which is hardware
     // muted.  See http://crbug.com/120749
     command_line->AppendSwitch(switches::kDisableAudio);

[DaleCurtis, 2012/11/06 21:54:51]

Ditto.

   }
 };
 
 // Each browser test can only correspond to a single layout test, otherwise the
 // 45 second timeout per test is not long enough for N tests on debug/asan/etc
 // builds.
 
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoAutoplayTest) {
   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");
 }
 
 }  // namespace content