Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

components/cdm/renderer/external_clear_key_key_system_properties.cc

Index: components/cdm/renderer/external_clear_key_key_system_properties.cc
diff --git a/components/cdm/renderer/external_clear_key_key_system_properties.cc b/components/cdm/renderer/external_clear_key_key_system_properties.cc
index b43b5c682a8cfaaf0eed35710e438d88c39595cb..8e59f3558f0a9895df68bc1613ec713e4697e6c5 100644
--- a/components/cdm/renderer/external_clear_key_key_system_properties.cc
+++ b/components/cdm/renderer/external_clear_key_key_system_properties.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "media/base/eme_constants.h"
-#include "media/media_features.h"
 #include "ppapi/features/features.h"
 
 namespace cdm {
@@ -33,11 +32,11 @@
       return true;
 
     case media::EmeInitDataType::CENC:
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
       return true;
 #else
       return false;
-#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
     case media::EmeInitDataType::UNKNOWN:
       return false;
@@ -47,7 +46,7 @@
 }
 
 media::SupportedCodecs ExternalClearKeyProperties::GetSupportedCodecs() const {
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
   return media::EME_CODEC_MP4_ALL | media::EME_CODEC_WEBM_ALL;
 #else
   return media::EME_CODEC_WEBM_ALL;