Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

content/browser/media/media_color_browsertest.cc

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 6bc9300c7845e2b2d15a78db5a62e467ea44e8d1..9442e7dbef52dd189f7f6d2f17ba04d6a346b7bd 100644
--- a/content/browser/media/media_color_browsertest.cc
+++ b/content/browser/media/media_color_browsertest.cc
@@ -6,7 +6,6 @@
 #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 {
 
@@ -43,7 +42,7 @@
   RunColorTest("yuv444p.webm");
 }
 
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
 
 // This fails on some Android devices: http://crbug.com/649199,
 // http://crbug.com/649185.
@@ -100,6 +99,6 @@
   RunColorTest("yuv420p.avi");
 }
 #endif  // defined(OS_CHROMEOS)
-#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
 }  // namespace content