Revert of Move ENABLE_PEPPER_CDMS to a buildflag header.

media/base/key_systems.cc

Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index f71dae2f18c93cac2395f7b9590693bf63eb4ff4..c2eb7f163076d82dd03b7ff2ca3255f7f9103e32 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -19,7 +19,6 @@
 #include "media/base/key_system_names.h"
 #include "media/base/key_system_properties.h"
 #include "media/base/media.h"
-#include "ppapi/features/features.h"
 #include "media/base/media_client.h"
 #include "third_party/widevine/cdm/widevine_cdm_common.h"
 
@@ -174,7 +173,7 @@
 
   bool UseAesDecryptor(const std::string& key_system) const;
 
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
   std::string GetPepperType(const std::string& key_system) const;
 #endif
 
@@ -406,7 +405,7 @@
     // 1) AES decryptor, and
     // 2) External Clear Key key system on Android, only enabled for testing.
     bool can_block = properties->UseAesDecryptor();
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
     DCHECK_EQ(properties->UseAesDecryptor(),
               properties->GetPepperType().empty());
     if (!properties->GetPepperType().empty())
@@ -507,7 +506,7 @@
   return key_system_iter->second->UseAesDecryptor();
 }
 
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
 std::string KeySystemsImpl::GetPepperType(const std::string& key_system) const {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ -706,7 +705,7 @@
   return KeySystemsImpl::GetInstance()->UseAesDecryptor(key_system);
 }
 
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
 std::string GetPepperType(const std::string& key_system) {
   return KeySystemsImpl::GetInstance()->GetPepperType(key_system);
 }