| Index: content/browser/media/media_browsertest.cc
|
| diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
|
| index 0a31335472aac8c1682383c6b16480ea01746f5d..6e7ccc8fefd7147c8f2e3c13c3db77a1e2cfbf2e 100644
|
| --- a/content/browser/media/media_browsertest.cc
|
| +++ b/content/browser/media/media_browsertest.cc
|
| @@ -15,6 +15,7 @@
|
| #include "content/shell/browser/shell.h"
|
| #include "media/base/media_switches.h"
|
| #include "media/base/test_data_util.h"
|
| +#include "media/media_features.h"
|
| #include "net/test/embedded_test_server/embedded_test_server.h"
|
|
|
| namespace content {
|
| @@ -141,7 +142,7 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear12DepthVP9) {
|
| }
|
| #endif
|
|
|
| -#if defined(USE_PROPRIETARY_CODECS)
|
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
| // Crashes on Mac http://crbug.com/621857
|
| // Fails on Android http://crbug.com/682387
|
| #if defined(OS_MACOSX) || defined(OS_ANDROID)
|
| @@ -200,10 +201,10 @@ IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearRotated180) {
|
| IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearRotated270) {
|
| RunVideoSizeTest("bear_rotate_270.mp4", 720, 1280);
|
| }
|
| -#endif // defined(USE_PROPRIETARY_CODECS)
|
| +#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
|
|
|
| #if defined(OS_CHROMEOS)
|
| -#if defined(USE_PROPRIETARY_CODECS)
|
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
| IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Mpeg4) {
|
| PlayVideo("bear_mpeg4_mp3.avi", GetParam());
|
| }
|
| @@ -227,7 +228,7 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) {
|
| IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) {
|
| PlayAudio("bear_gsm_ms.wav", GetParam());
|
| }
|
| -#endif // defined(USE_PROPRIETARY_CODECS)
|
| +#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| IN_PROC_BROWSER_TEST_P(MediaTest, AudioBearFlac) {
|
|
|