Support Android secure codecs in requestMediaKeySystemAccess().

media/base/key_systems_unittest.cc

Index: media/base/key_systems_unittest.cc
diff --git a/media/base/key_systems_unittest.cc b/media/base/key_systems_unittest.cc
index 611c2b6f1b722349050423f35d340007c2058c07..1a2948892583c6858fdc0c0bd9a7e5705f541a05 100644
--- a/media/base/key_systems_unittest.cc
+++ b/media/base/key_systems_unittest.cc
@@ -77,16 +77,18 @@ static bool IsSupportedKeySystemWithMediaMimeType(
     const std::string& mime_type,
     const std::vector<std::string>& codecs,
     const std::string& key_system) {
-  return KeySystems::GetInstance()->IsSupportedCodecCombination(
-      key_system, EmeMediaType::VIDEO, mime_type, codecs);
+  return (KeySystems::GetInstance()->GetContentTypeConfigRule(
+              key_system, EmeMediaType::VIDEO, mime_type, codecs) !=
+          EmeConfigRule::NOT_SUPPORTED);
 }
 
 static bool IsSupportedKeySystemWithAudioMimeType(
     const std::string& mime_type,
     const std::vector<std::string>& codecs,
     const std::string& key_system) {
-  return KeySystems::GetInstance()->IsSupportedCodecCombination(
-      key_system, EmeMediaType::AUDIO, mime_type, codecs);
+  return (KeySystems::GetInstance()->GetContentTypeConfigRule(
+              key_system, EmeMediaType::AUDIO, mime_type, codecs) !=
+          EmeConfigRule::NOT_SUPPORTED);
 }
 
 // Adds test container and codec masks.