Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

media/cdm/aes_decryptor.cc

Index: media/cdm/aes_decryptor.cc
diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc
index cea7ad99291acc078f9ba23eb68f149cfe835b48..3f41e2941a9375239711bd1da2254b9f6e5895dd 100644
--- a/media/cdm/aes_decryptor.cc
+++ b/media/cdm/aes_decryptor.cc
@@ -23,9 +23,8 @@
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/cdm/json_web_key.h"
-#include "media/media_features.h"
-
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+
+#if defined(USE_PROPRIETARY_CODECS)
 #include "media/cdm/cenc_utils.h"
 #endif
 
@@ -280,7 +279,7 @@
       keys.push_back(init_data);
       break;
     case EmeInitDataType::CENC:
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
       // |init_data| is a set of 0 or more concatenated 'pssh' boxes.
       if (!GetKeyIdsForCommonSystemId(init_data, &keys)) {
         promise->reject(CdmPromise::NOT_SUPPORTED_ERROR, 0,