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

Unified Diff: content/browser/media/media_browsertest.cc

Issue 2580093002: Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Created 4 years 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
Index: content/browser/media/media_browsertest.cc
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index fb617e24c8baa9bb66801630cd154b85d462edd4..1bfb71e792b3768d5963a7dcf70e8290f5acb13a 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -15,7 +15,6 @@
#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 {
@@ -142,7 +141,7 @@
}
#endif
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
// Crashes on Mac only. http://crbug.com/621857
#if defined(OS_MACOSX)
#define MAYBE_VideoBearMp4 DISABLED_VideoBearMp4
@@ -200,10 +199,10 @@
IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearRotated270) {
RunVideoSizeTest("bear_rotate_270.mp4", 720, 1280);
}
-#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif // defined(USE_PROPRIETARY_CODECS)
#if defined(OS_CHROMEOS)
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Mpeg4) {
PlayVideo("bear_mpeg4_mp3.avi", GetParam());
}
@@ -227,7 +226,7 @@
IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) {
PlayAudio("bear_gsm_ms.wav", GetParam());
}
-#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif // defined(USE_PROPRIETARY_CODECS)
#endif // defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_P(MediaTest, AudioBearFlac) {
« no previous file with comments | « components/cdm/renderer/widevine_key_system_properties.cc ('k') | content/browser/media/media_canplaytype_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698