Add EME support for new VP9 codec string in WebM.

media/base/eme_constants.h

Index: media/base/eme_constants.h
diff --git a/media/base/eme_constants.h b/media/base/eme_constants.h
index 7a7d933b74b2c7d839505bc1ab8ce5932ac0694a..1d9fd910df11a8d7074ff9479aa67cf50605a1c2 100644
--- a/media/base/eme_constants.h
+++ b/media/base/eme_constants.h
@@ -25,22 +25,23 @@ enum EmeCodec {
   EME_CODEC_NONE = 0,
   EME_CODEC_WEBM_OPUS = 1 << 0,
   EME_CODEC_WEBM_VORBIS = 1 << 1,
-  EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_OPUS | EME_CODEC_WEBM_VORBIS,
   EME_CODEC_WEBM_VP8 = 1 << 2,
   EME_CODEC_WEBM_VP9 = 1 << 3,
-  EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9),
+  EME_CODEC_MP4_AAC = 1 << 4,
+  EME_CODEC_MP4_AVC1 = 1 << 5,
+  EME_CODEC_COMMON_VP9 = 1 << 6,
+  EME_CODEC_MP4_HEVC = 1 << 7,
+  EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_OPUS | EME_CODEC_WEBM_VORBIS,
+  EME_CODEC_WEBM_VIDEO_ALL =
+      (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9 | EME_CODEC_COMMON_VP9),
   EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
-  EME_CODEC_MP4_AAC = 1 << 4,
   EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
-  EME_CODEC_MP4_AVC1 = 1 << 5,
-  EME_CODEC_MP4_VP9 = 1 << 6,
 #if !BUILDFLAG(ENABLE_HEVC_DEMUXING)
-  EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9),
+  EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_COMMON_VP9),
 #else
-  EME_CODEC_MP4_HEVC = 1 << 7,
   EME_CODEC_MP4_VIDEO_ALL =
-      (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9 | EME_CODEC_MP4_HEVC),
+      (EME_CODEC_MP4_AVC1 | EME_CODEC_COMMON_VP9 | EME_CODEC_MP4_HEVC),
 #endif
   EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
   EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL),