| 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)
|
| +#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
|
|
|