media: Clean up MediaCodecBridge and remove subclasses

components/cdm/browser/cdm_message_filter_android.cc

Index: components/cdm/browser/cdm_message_filter_android.cc
diff --git a/components/cdm/browser/cdm_message_filter_android.cc b/components/cdm/browser/cdm_message_filter_android.cc
index 22417ebcaee4fd456e7645fc34902efabfd0702a..195823454fe1edf170e7e54b159849244a1a9a49 100644
--- a/components/cdm/browser/cdm_message_filter_android.cc
+++ b/components/cdm/browser/cdm_message_filter_android.cc
@@ -14,6 +14,8 @@
 #include "ipc/ipc_message_macros.h"
 #include "media/base/android/media_codec_util.h"
 #include "media/base/android/media_drm_bridge.h"
+#include "media/base/audio_codecs.h"
+#include "media/base/video_codecs.h"
 #include "media/media_features.h"
 
 using content::BrowserThread;
@@ -32,20 +34,34 @@ enum CodecType {
 struct CodecInfo {
   SupportedCodecs codec;
   CodecType codec_type;
-  const char* codec_name;
+  const std::string mime_type;
   const char* container_mime_type;
 };
 
 const CodecInfo kCodecsToQuery[] = {
-  {media::EME_CODEC_WEBM_OPUS, CODEC_AUDIO, "opus", "video/webm"},

[watk, 2017/02/14 01:40:50]

By passing the mime type instead of names we can remove the name->mime
conversion function from MediaCodecUtil.

-  {media::EME_CODEC_WEBM_VORBIS, CODEC_AUDIO, "vorbis", "video/webm"},
-  {media::EME_CODEC_WEBM_VP8, CODEC_VIDEO, "vp8", "video/webm"},
-  {media::EME_CODEC_WEBM_VP9, CODEC_VIDEO, "vp9", "video/webm"},
+    {media::EME_CODEC_WEBM_OPUS, CODEC_AUDIO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecOpus),
+     "video/webm"},
+    {media::EME_CODEC_WEBM_VORBIS, CODEC_AUDIO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecVorbis),
+     "video/webm"},
+    {media::EME_CODEC_WEBM_VP8, CODEC_VIDEO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecVP8),
+     "video/webm"},
+    {media::EME_CODEC_WEBM_VP9, CODEC_VIDEO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecVP9),
+     "video/webm"},
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
-  {media::EME_CODEC_MP4_AAC, CODEC_AUDIO, "mp4a", "video/mp4"},
-  {media::EME_CODEC_MP4_AVC1, CODEC_VIDEO, "avc1", "video/mp4"},
+    {media::EME_CODEC_MP4_AAC, CODEC_AUDIO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecAAC),
+     "video/mp4"},
+    {media::EME_CODEC_MP4_AVC1, CODEC_VIDEO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecH264),
+     "video/mp4"},
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
-  {media::EME_CODEC_MP4_HEVC, CODEC_VIDEO, "hvc1", "video/mp4"},
+    {media::EME_CODEC_MP4_HEVC, CODEC_VIDEO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecHevc),
+     "video/mp4"},
 #endif
 #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
 };
@@ -65,7 +81,7 @@ static SupportedCodecs GetSupportedCodecs(
     if ((request.codecs & info.codec) &&
         MediaDrmBridge::IsKeySystemSupportedWithType(
             key_system, info.container_mime_type) &&
-        media::MediaCodecUtil::CanDecode(info.codec_name, is_secure)) {
+        media::MediaCodecUtil::CanDecode(info.mime_type, is_secure)) {
       supported_codecs |= info.codec;
     }
   }