Convert enable_mpeg2ts into a new-style buildflag

content/browser/media/media_source_browsertest.cc

Index: content/browser/media/media_source_browsertest.cc
diff --git a/content/browser/media/media_source_browsertest.cc b/content/browser/media/media_source_browsertest.cc
index 33dd0adcfdeb707b684b1253b7cf17841884edc8..116fd482e7741c48c779cf5d1c96c706c026140e 100644
--- a/content/browser/media/media_source_browsertest.cc
+++ b/content/browser/media/media_source_browsertest.cc
@@ -5,6 +5,7 @@
 #include "base/command_line.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/common/content_switches.h"
+#include "media/media_features.h"
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
@@ -20,9 +21,11 @@ const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\"";
 const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";
 const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";
 
-#if defined(USE_PROPRIETARY_CODECS) && defined(ENABLE_MPEG2TS_STREAM_PARSER)
+#if defined(USE_PROPRIETARY_CODECS)

[ddorwin, 2016/01/04 22:19:45]

Should we convert all such media-related checks in a separate (set of) CL(s)?
Consistency will help people remember the correct way and hopefully avoid
mistakes.

[servolk, 2016/01/05 00:18:09]

Yes, I guess in the future we'll convert all the legacy flags into new-style
buildflags, but I think perhaps it would be better to convert each flag in a
separate CLs (or maybe each set of related flags in a separate CL). That would
make it easier to review and easier to make it work as a sequence of incremental
steps (and hopefully easier to detect and isolate regressions, in case some
conversions accidentally introduce bugs). I've decided to start with
enable_mpeg2ts since it's fairly different from all other existing media flags
(currently defined globally in common.gypi, which we want to avoid going
forward), plus mpeg2ts is only enabled by Chromecast, so this should be the
least risky flag to convert from Chromium point of view.

+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
 const char kMp2tAudioVideo[] = "video/mp2t; codecs=\"mp4a.40.2, avc1.42E01E\"";
 #endif
+#endif
 
 namespace content {
 
@@ -126,9 +129,11 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Video_WEBM_Audio_MP4) {
 }
 #endif
 
-#if defined(USE_PROPRIETARY_CODECS) && defined(ENABLE_MPEG2TS_STREAM_PARSER)
+#if defined(USE_PROPRIETARY_CODECS)
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioVideo_Mp2t) {
   TestSimplePlayback("bear-1280x720.ts", kMp2tAudioVideo, kEnded);
 }
 #endif
+#endif
 }  // namespace content