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

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

Issue 2572883002: Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Merge 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_color_browsertest.cc
diff --git a/content/browser/media/media_color_browsertest.cc b/content/browser/media/media_color_browsertest.cc
index 9442e7dbef52dd189f7f6d2f17ba04d6a346b7bd..6bc9300c7845e2b2d15a78db5a62e467ea44e8d1 100644
--- a/content/browser/media/media_color_browsertest.cc
+++ b/content/browser/media/media_color_browsertest.cc
@@ -6,6 +6,7 @@
#include "content/browser/media/media_browsertest.h"
#include "content/public/test/browser_test_utils.h"
#include "media/base/test_data_util.h"
+#include "media/media_features.h"
namespace content {
@@ -42,7 +43,7 @@ IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv444pVp9) {
RunColorTest("yuv444p.webm");
}
-#if defined(USE_PROPRIETARY_CODECS)
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
// This fails on some Android devices: http://crbug.com/649199,
// http://crbug.com/649185.
@@ -99,6 +100,6 @@ IN_PROC_BROWSER_TEST_F(MediaColorTest, Yuv420pMpeg4) {
RunColorTest("yuv420p.avi");
}
#endif // defined(OS_CHROMEOS)
-#endif // defined(USE_PROPRIETARY_CODECS)
+#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
} // namespace content
« no previous file with comments | « content/browser/media/media_canplaytype_browsertest.cc ('k') | content/browser/media/media_redirect_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698