Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

components/cdm/renderer/android_key_systems.cc

 // Copyright 2014 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/android_key_systems.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "components/cdm/common/cdm_messages_android.h"
 #include "components/cdm/renderer/widevine_key_system_properties.h"
 #include "content/public/renderer/render_thread.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_switches.h"
-#include "media/media_features.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 using media::EmeConfigRule;
 using media::EmeFeatureSupport;
 using media::EmeInitDataType;
 using media::EmeSessionTypeSupport;
 using media::KeySystemProperties;
 using media::SupportedCodecs;
 using Robustness = cdm::WidevineKeySystemProperties::Robustness;
@@ skipping 14 matching lines @@
   std::string GetKeySystemName() const override { return name_; }
 
   bool IsSupportedInitDataType(EmeInitDataType init_data_type) const override {
     // Here we assume that support for a container implies support for the
     // associated initialization data type. KeySystems handles validating
     // |init_data_type| x |container| pairings.
     switch (init_data_type) {
       case EmeInitDataType::WEBM:
         return (supported_codecs_ & media::EME_CODEC_WEBM_ALL) != 0;
       case EmeInitDataType::CENC:
-#if BUILDFLAG(USE_PROPRIETARY_CODECS)
+#if defined(USE_PROPRIETARY_CODECS)
         return (supported_codecs_ & media::EME_CODEC_MP4_ALL) != 0;
 #else
         return false;
-#endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+#endif  // defined(USE_PROPRIETARY_CODECS)
       case EmeInitDataType::KEYIDS:
       case EmeInitDataType::UNKNOWN:
         return false;
     }
     NOTREACHED();
     return false;
   }
 
   SupportedCodecs GetSupportedCodecs() const override {
     return supported_codecs_;
@@ skipping 78 matching lines @@
        it != key_system_names.end(); ++it) {
     SupportedKeySystemResponse response = QueryKeySystemSupport(*it);
     if (response.compositing_codecs != media::EME_CODEC_NONE) {
       concrete_key_systems->emplace_back(new AndroidPlatformKeySystemProperties(
           *it, response.compositing_codecs));
     }
   }
 }
 
 }  // namespace cdm