Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

components/cdm/renderer/widevine_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/widevine_key_system_properties.h"
 
-#include "media/media_features.h"
 #include "ppapi/features/features.h"
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 
 using media::EmeConfigRule;
 using media::EmeFeatureSupport;
 using media::EmeInitDataType;
 using media::EmeMediaType;
 using media::EmeSessionTypeSupport;
@@ skipping 48 matching lines @@
   return kWidevineKeySystem;
 }
 
 bool WidevineKeySystemProperties::IsSupportedInitDataType(
     EmeInitDataType init_data_type) const {
   // Here we assume that support for a container imples support for the
   // associated initialization data type. KeySystems handles validating
   // |init_data_type| x |container| pairings.
   if (init_data_type == EmeInitDataType::WEBM)
     return (supported_codecs_ & media::EME_CODEC_WEBM_ALL) != 0;
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
   if (init_data_type == EmeInitDataType::CENC)
     return (supported_codecs_ & media::EME_CODEC_MP4_ALL) != 0;
-#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
   return false;
 }
 
 SupportedCodecs WidevineKeySystemProperties::GetSupportedCodecs() const {
   return supported_codecs_;
 }
 
 #if defined(OS_ANDROID)
 SupportedCodecs WidevineKeySystemProperties::GetSupportedSecureCodecs() const {
@@ skipping 75 matching lines @@
 
 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
 std::string WidevineKeySystemProperties::GetPepperType() const {
   return kWidevineCdmPluginMimeType;
 }
 #endif
 
 }  // namespace cdm
 
 #endif  // WIDEVINE_CDM_AVAILABLE