Support Android secure codecs in requestMediaKeySystemAccess().

media/base/key_systems.h

 // 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.
 
 #ifndef MEDIA_BASE_KEY_SYSTEMS_H_
 #define MEDIA_BASE_KEY_SYSTEMS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 16 matching lines @@
   static KeySystems* GetInstance();
 
   // Returns whether |key_system| is a supported key system.
   virtual bool IsSupportedKeySystem(const std::string& key_system) const = 0;
 
   // Returns whether |init_data_type| is supported by |key_system|.
   virtual bool IsSupportedInitDataType(
       const std::string& key_system,
       EmeInitDataType init_data_type) const = 0;
 
-  // Returns whether the list of codecs are supported together by |key_system|.
-  // TODO(sandersd): Return a rule instead of a bool so that codec selection can
-  // affect other configuration options (namely robustness).
-  virtual bool IsSupportedCodecCombination(
+  // Returns the configuration rule for supporting a container and list of
+  // codecs.
+  virtual EmeConfigRule GetContentTypeConfigRule(
       const std::string& key_system,
       EmeMediaType media_type,
       const std::string& container_mime_type,
       const std::vector<std::string>& codecs) const = 0;
 
   // Returns the configuration rule for supporting a robustness requirement.
   virtual EmeConfigRule GetRobustnessConfigRule(
       const std::string& key_system,
       EmeMediaType media_type,
       const std::string& requested_robustness) const = 0;
@@ skipping 75 matching lines @@
 MEDIA_EXPORT void AddContainerMask(const std::string& container, uint32 mask);
 MEDIA_EXPORT void AddCodecMask(
     EmeMediaType media_type,
     const std::string& codec,
     uint32 mask);
 #endif  // defined(UNIT_TEST)
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_KEY_SYSTEMS_H_