| 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 65d1cd1ed678ad31e8b9ceba35e889788245fb49..9423d9047bd4e696aac596e89f0d0f1ed7dd810c 100644 | 
| --- a/content/browser/media/media_source_browsertest.cc | 
| +++ b/content/browser/media/media_source_browsertest.cc | 
| @@ -7,12 +7,13 @@ | 
| #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 | 
|  | 
| // Common media types. | 
| -#if defined(USE_PROPRIETARY_CODECS) && !defined(OS_ANDROID) | 
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS) && !defined(OS_ANDROID) | 
| const char kAAC_ADTS_AudioOnly[] = "audio/aac"; | 
| #endif | 
| const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\""; | 
| @@ -22,7 +23,7 @@ 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) | 
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS) | 
| #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) | 
| const char kMp2tAudioVideo[] = "video/mp2t; codecs=\"mp4a.40.2, avc1.42E01E\""; | 
| #endif | 
| @@ -59,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoOnly_WebM) { | 
| // TODO(servolk): Android is supposed to support AAC in ADTS container with | 
| // 'audio/aac' mime type, but for some reason playback fails on trybots due to | 
| // some issue in OMX AAC decoder (crbug.com/528361) | 
| -#if defined(USE_PROPRIETARY_CODECS) && !defined(OS_ANDROID) | 
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS) && !defined(OS_ANDROID) | 
| IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_AAC_ADTS) { | 
| TestSimplePlayback("sfx.adts", kAAC_ADTS_AudioOnly, kEnded); | 
| } | 
| @@ -86,7 +87,7 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { | 
| RunMediaTestPage("mse_config_change.html", base::StringPairs(), kEnded, true); | 
| } | 
|  | 
| -#if defined(USE_PROPRIETARY_CODECS) | 
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS) | 
|  | 
| // TODO(chcunningham): Figure out why this is flaky on android. crbug/607841 | 
| #if !defined(OS_ANDROID) | 
| @@ -106,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Video_WEBM_Audio_MP4) { | 
| } | 
| #endif | 
|  | 
| -#if defined(USE_PROPRIETARY_CODECS) | 
| +#if BUILDFLAG(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); | 
|  |