Implement unit test specific test launcher timeout

media/base/demuxer_perftest.cc

Index: media/base/demuxer_perftest.cc
diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc
index f5a11526b2d66a1fb47e0832ec3d2ea9122e8f36..197207c39ef92b6eef81967964cd9a2bb5ba55f7 100644
--- a/media/base/demuxer_perftest.cc
+++ b/media/base/demuxer_perftest.cc
@@ -207,26 +207,33 @@ static void RunDemuxerBenchmark(const std::string& filename) {
                          true);
 }
 
-#if defined(OS_WIN)
-// http://crbug.com/399002
-#define MAYBE_Demuxer DISABLED_Demuxer
-#else
-#define MAYBE_Demuxer Demuxer
-#endif
-TEST(DemuxerPerfTest, MAYBE_Demuxer) {
-  RunDemuxerBenchmark("bear.ogv");
-  RunDemuxerBenchmark("bear-640x360.webm");
-  RunDemuxerBenchmark("sfx_s16le.wav");
+class DemuxerPerfTest : public testing::TestWithParam<const char*> {
+};
+
+const char* kDemuxerBenchmarks[] = {
+  "bear.ogv",
+  "bear-640x360.webm",
+  "sfx_s16le.wav",
 #if defined(USE_PROPRIETARY_CODECS)
-  RunDemuxerBenchmark("bear-1280x720.mp4");
-  RunDemuxerBenchmark("sfx.mp3");
+  "bear-1280x720.mp4",
+  "sfx.mp3",
 #endif
 #if defined(OS_CHROMEOS)
-  RunDemuxerBenchmark("bear.flac");
+  "bear.flac",
 #endif
 #if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
-  RunDemuxerBenchmark("bear.avi");
+  "bear.avi",
 #endif
+};
+
+TEST_P(DemuxerPerfTest, Demuxer) {
+  RunDemuxerBenchmark(GetParam());
 }
 
+#if !defined(OS_WIN)
+// http://crbug.com/399002
+INSTANTIATE_TEST_CASE_P(, DemuxerPerfTest,

[DaleCurtis, 2014/08/22 18:22:10]

Hmm, is this valid syntax? Never seen the no first arg variant before.  Do we
want to run this on windows now that it's split up?

[Paweł Hajdan Jr., 2014/08/25 12:40:33]

It is valid, used e.g. by FTP tests. And it passed the trybots.
Can be done in separate patch, I'd prefer that to owner of the original bug.

+                        testing::ValuesIn(kDemuxerBenchmarks));
+#endif  // !defined(OS_WIN)
+
 }  // namespace media