Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

components/cdm/renderer/external_clear_key_key_system_properties.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
 
 #include "base/logging.h"
 #include "media/base/eme_constants.h"
-#include "media/media_features.h"
 #include "ppapi/features/features.h"
 
 namespace cdm {
 
 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
 const char kExternalClearKeyPepperType[] = "application/x-ppapi-clearkey-cdm";
 #endif
 
 ExternalClearKeyProperties::ExternalClearKeyProperties(
     const std::string& key_system_name)
     : key_system_name_(key_system_name) {}
 
 ExternalClearKeyProperties::~ExternalClearKeyProperties() {}
 
 std::string ExternalClearKeyProperties::GetKeySystemName() const {
   return key_system_name_;
 }
 
 bool ExternalClearKeyProperties::IsSupportedInitDataType(
     media::EmeInitDataType init_data_type) const {
   switch (init_data_type) {
     case media::EmeInitDataType::WEBM:
     case media::EmeInitDataType::KEYIDS:
       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;
   }
   NOTREACHED();
   return false;
 }
 
 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;
 #endif
 }
 
 media::EmeConfigRule ExternalClearKeyProperties::GetRobustnessConfigRule(
     media::EmeMediaType media_type,
     const std::string& requested_robustness) const {
   return requested_robustness.empty() ? media::EmeConfigRule::SUPPORTED
@@ skipping 21 matching lines @@
   return media::EmeFeatureSupport::NOT_SUPPORTED;
 }
 
 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
 std::string ExternalClearKeyProperties::GetPepperType() const {
   return kExternalClearKeyPepperType;
 }
 #endif
 
 }  // namespace cdm