Store SupportedCodecs in KeySystemInfo and KeySystems.

chrome/common/encrypted_media_messages_android.h

Index: chrome/common/encrypted_media_messages_android.h
diff --git a/chrome/common/encrypted_media_messages_android.h b/chrome/common/encrypted_media_messages_android.h
index c18cda5cca949f58a986fefd8b3837ab4f86570f..c2f33b23b2e5bae52c396d07a80c4071ffad4a6b 100644
--- a/chrome/common/encrypted_media_messages_android.h
+++ b/chrome/common/encrypted_media_messages_android.h
@@ -8,48 +8,23 @@
 #include <vector>
 
 #include "ipc/ipc_message_macros.h"
-
-// Singly-included section for enums and custom IPC traits.
-#ifndef CHROME_COMMON_ENCRYPTED_MEDIA_MESSAGES_ANDROID_H
-#define CHROME_COMMON_ENCRYPTED_MEDIA_MESSAGES_ANDROID_H
-
-namespace android {
-
-// Defines bitmask values used to specify supported codecs.
-// Each value represents a codec within a specific container.
-enum SupportedCodecs {
-  NO_CODECS = 0,
-  WEBM_VORBIS = 1 << 0,
-  WEBM_VP8 = 1 << 1,
-  WEBM_CODECS = (WEBM_VORBIS | WEBM_VP8),
-  MP4_AAC = 1 << 2,
-  MP4_AVC1 = 1 << 3,
-  MP4_CODECS = (MP4_AAC | MP4_AVC1),
-  ALL_CODECS = (WEBM_CODECS | MP4_CODECS),
-  INVALID_CODECS = ~ALL_CODECS
-};
-
-}  // namespace android
-
-#endif  // CHROME_COMMON_ENCRYPTED_MEDIA_MESSAGES_ANDROID_H
-
+#include "media/cdm/encrypted_media_codecs.h"
 
 #define IPC_MESSAGE_START EncryptedMediaMsgStart
 
-IPC_ENUM_TRAITS(android::SupportedCodecs)
-
 IPC_STRUCT_BEGIN(SupportedKeySystemRequest)
   IPC_STRUCT_MEMBER(std::string, key_system)
-  IPC_STRUCT_MEMBER(android::SupportedCodecs, codecs,
-                    android::NO_CODECS)
+  IPC_STRUCT_MEMBER(media::SupportedCodecs, codecs, media::NO_CODECS)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(SupportedKeySystemResponse)
   IPC_STRUCT_MEMBER(std::string, key_system)
-  IPC_STRUCT_MEMBER(android::SupportedCodecs, compositing_codecs,
-                    android::NO_CODECS)
-  IPC_STRUCT_MEMBER(android::SupportedCodecs, non_compositing_codecs,
-                    android::NO_CODECS)
+  IPC_STRUCT_MEMBER(media::SupportedCodecs,
+                    compositing_codecs,
+                    media::NO_CODECS)
+  IPC_STRUCT_MEMBER(media::SupportedCodecs,
+                    non_compositing_codecs,
+                    media::NO_CODECS)
 IPC_STRUCT_END()
 
 // Messages sent from the renderer to the browser.