Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 21c2ae166bb03873c69f142c7594115873cc368f..8d3124cf3e60287ff9e7d1786ce0d3993b30fda6 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -43,7 +43,6 @@
 #include "extensions/common/constants.h"
 #include "extensions/features/features.h"
 #include "gpu/config/gpu_info.h"
-#include "media/media_features.h"
 #include "net/http/http_util.h"
 #include "pdf/features.h"
 #include "ppapi/features/features.h"
@@ -136,9 +135,9 @@
       // This list must match the CDM that is being bundled with Chrome.
       codecs_supported->push_back(kCdmSupportedCodecVp8);
       codecs_supported->push_back(kCdmSupportedCodecVp9);
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
       codecs_supported->push_back(kCdmSupportedCodecAvc1);
-#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif  // defined(USE_PROPRIETARY_CODECS)
       return true;
     }
   }