Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

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 4a2b708978c130e3b312715f2d054ef96f254df4..684e60ae45249cff7c8bfd90ee777931d55691ad 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -722,10 +722,10 @@
     //
     // Because the check for regular codec support is early-exit, we don't have
     // to consider codecs that are only supported in hardware-secure mode. We
-    // could do so, and make use of HW_SECURE_CODECS_REQUIRED, if it turns out
-    // that hardware-secure-only codecs actually exist and are useful.
+    // could do so, and make use of SECURE_CODECS_REQUIRED, if it turns out that
+    // hardware-secure-only codecs actually exist and are useful.
     if ((codec & key_system_secure_codec_mask) == 0)
-      support = EmeConfigRule::HW_SECURE_CODECS_NOT_ALLOWED;
+      support = EmeConfigRule::SECURE_CODECS_NOT_ALLOWED;
 #endif  // defined(OS_ANDROID)
   }
 
@@ -788,7 +788,7 @@
     }
 #elif defined(OS_ANDROID)
     if (robustness > EmeRobustness::SW_SECURE_CRYPTO)
-      return EmeConfigRule::HW_SECURE_CODECS_REQUIRED;
+      return EmeConfigRule::SECURE_CODECS_REQUIRED;
 #endif  // defined(OS_CHROMEOS)
   }