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..50f15c68605fd961f0127171b303e99354252ed2 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"

[watk, 2017/02/14 02:32:45]

Note to me: delete these now.

 #include "media/media_features.h"
 
 using content::BrowserThread;
@@ -32,20 +34,27 @@ enum CodecType {
 struct CodecInfo {
   SupportedCodecs codec;
   CodecType codec_type;
-  const char* codec_name;
+  const char* mime_type;
   const char* container_mime_type;
 };
 
 const CodecInfo kCodecsToQuery[] = {
-  {media::EME_CODEC_WEBM_OPUS, CODEC_AUDIO, "opus", "video/webm"},
-  {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::mime_type::kOpus,
+     "video/webm"},
+    {media::EME_CODEC_WEBM_VORBIS, CODEC_AUDIO, media::mime_type::kVorbis,
+     "video/webm"},
+    {media::EME_CODEC_WEBM_VP8, CODEC_VIDEO, media::mime_type::kVP8,
+     "video/webm"},
+    {media::EME_CODEC_WEBM_VP9, CODEC_VIDEO, media::mime_type::kVP9,
+     "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::mime_type::kAAC,
+     "video/mp4"},
+    {media::EME_CODEC_MP4_AVC1, CODEC_VIDEO, media::mime_type::kH264,
+     "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::mime_type::kHevc,
+     "video/mp4"},
 #endif
 #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
 };
@@ -65,7 +74,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;
     }
   }