Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(375)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/demuxer_perftest.cc

Issue 2515553002: Fix mimetype mappings for FLAC support. (Closed)
Patch Set: Fix test deletion during merge. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/browser/media/media_canplaytype_browsertest.cc ('K') | « content/browser/media/media_canplaytype_browsertest.cc ('k') | media/base/mime_util_internal.h » ('j') | media/base/mime_util_internal.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/demuxer_perftest.cc
diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc
index 0407c9be4319a866f3f8ceb38a48f3d620530cb2..3ec8cca611bb8537024f18e61a72ec0035838f3f 100644
--- a/media/base/demuxer_perftest.cc
+++ b/media/base/demuxer_perftest.cc
@@ -238,13 +238,11 @@ TEST(DemuxerPerfTest, MAYBE_Demuxer) {
RunDemuxerBenchmark("bear.ogv");
RunDemuxerBenchmark("bear-640x360.webm");
RunDemuxerBenchmark("sfx_s16le.wav");
+ RunDemuxerBenchmark("bear.flac");
#if defined(USE_PROPRIETARY_CODECS)
RunDemuxerBenchmark("bear-1280x720.mp4");
RunDemuxerBenchmark("sfx.mp3");
#endif
-#if defined(OS_CHROMEOS)
- RunDemuxerBenchmark("bear.flac");
-#endif
#if defined(USE_PROPRIETARY_CODECS) && defined(OS_CHROMEOS)
RunDemuxerBenchmark("bear.avi");
#endif
« content/browser/media/media_canplaytype_browsertest.cc ('K') | « content/browser/media/media_canplaytype_browsertest.cc ('k') | media/base/mime_util_internal.h » ('j') | media/base/mime_util_internal.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698