Store SupportedCodecs in KeySystemInfo and KeySystems.

android_webview/renderer/aw_key_systems.cc

Index: android_webview/renderer/aw_key_systems.cc
diff --git a/android_webview/renderer/aw_key_systems.cc b/android_webview/renderer/aw_key_systems.cc
index ec976f0cc4924d151eabf07fb9daf03334ef6d92..4d89435e3477cbefaea85585eb8861b945b962b1 100644
--- a/android_webview/renderer/aw_key_systems.cc
+++ b/android_webview/renderer/aw_key_systems.cc
@@ -8,18 +8,13 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "media/cdm/encrypted_media_codecs.h"
 #include "third_party/widevine/cdm/widevine_cdm_common.h"
 
 using content::KeySystemInfo;
 
 namespace {
 
-const char kAudioMp4[] = "audio/mp4";
-const char kVideoMp4[] = "video/mp4";
-const char kMp4a[] = "mp4a";
-const char kAvc1[] = "avc1";
-const char kAvc3[] = "avc3";
-
 // Return |name|'s parent key system.
 std::string GetDirectParentName(const std::string& name) {
   int last_period = name.find_last_of('.');
@@ -35,10 +30,7 @@ void AddWidevineWithCodecs(const std::string& key_system_name,
   if (add_parent_name)
     info.parent_key_system = GetDirectParentName(key_system_name);
 
-  info.supported_types[kAudioMp4].insert(kMp4a);
-  info.supported_types[kVideoMp4] = info.supported_types[kAudioMp4];
-  info.supported_types[kVideoMp4].insert(kAvc1);
-  info.supported_types[kVideoMp4].insert(kAvc3);
+  info.supported_codecs = media::MP4_CODECS;
 
   concrete_key_systems->push_back(info);
 }