Support Android secure codecs in requestMediaKeySystemAccess().

media/base/key_systems_unittest.cc

 // Copyright 2013 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.
 
 // TODO(sandersd): Refactor to remove recomputed codec arrays, and generally
 // shorten and improve coverage.
 //   - http://crbug.com/417444
 //   - http://crbug.com/457438
 // TODO(sandersd): Add tests to cover codec vectors with empty items.
 // http://crbug.com/417461
@@ skipping 59 matching lines @@
 
 static_assert((TEST_CODEC_FOO_ALL & EME_CODEC_ALL) == EME_CODEC_NONE,
               "test codec masks should only use invalid codec masks");
 
 // Adapt IsSupportedKeySystemWithMediaMimeType() to the new API,
 // IsSupportedCodecCombination().
 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.
 // This function must be called after SetMediaClient() if a MediaClient will be
 // provided.
 // More details: AddXxxMask() will create KeySystems if it hasn't been created.
 // During KeySystems's construction GetMediaClient() will be used to add key
 // systems. In test code, the MediaClient is set by SetMediaClient().
 // Therefore, SetMediaClient() must be called before this function to make sure
 // MediaClient in effect when constructing KeySystems.
@@ skipping 738 matching lines @@
   EXPECT_FALSE(IsSupportedKeySystem("com.chromecast.something.else"));
   EXPECT_FALSE(IsSupportedKeySystem("com.chromecast.other"));
 
   EXPECT_FALSE(IsSupportedKeySystem("x-"));
   EXPECT_TRUE(IsSupportedKeySystem("x-something"));
   EXPECT_FALSE(IsSupportedKeySystem("x-something.else"));
   EXPECT_FALSE(IsSupportedKeySystem("x-other"));
 }
 
 }  // namespace media