Change EmeInitDataType to be an enum class

media/base/eme_constants.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_EME_CONSTANTS_H_
 #define MEDIA_BASE_EME_CONSTANTS_H_
 
 #include <stdint.h>
 
 namespace media {
 
-// Defines bitmask values that specify registered initialization data types used
+// Defines values that specify registered Initialization Data Types used
 // in Encrypted Media Extensions (EME).
+// http://w3c.github.io/encrypted-media/initdata-format-registry.html#registry
 // The mask values are stored in a SupportedInitDataTypes.
-enum EmeInitDataType {
-  EME_INIT_DATA_TYPE_NONE = 0,
-  EME_INIT_DATA_TYPE_WEBM = 1 << 0,
-#if defined(USE_PROPRIETARY_CODECS)
-  EME_INIT_DATA_TYPE_CENC = 1 << 1,
-#endif  // defined(USE_PROPRIETARY_CODECS)
-  EME_INIT_DATA_TYPE_KEYIDS = 1 << 2,
+enum class EmeInitDataType {
+  NONE,

[sandersd (OOO until July 31), 2015/03/23 21:27:30]

Remove NONE.

I see that it's used in two places, I've commented in those places.

[jrummell, 2015/03/25 21:44:25]

Until everything is converted to an enum, I think we need something to handle
unexpected strings. Once everything is converted (a few CLs from now), we can
see if it can be removed. Renamed to UNKNOWN.

+  WEBM,
+  CENC,
+  KEYIDS
 };
 
+typedef uint32_t SupportedInitDataTypes;

[sandersd (OOO until July 31), 2015/03/23 21:27:30]

InitDataTypeMask

[jrummell, 2015/03/25 21:44:25]

Done.

+const SupportedInitDataTypes kSupportedInitDataTypeNone = 0;
+const SupportedInitDataTypes kSupportedInitDataTypeWebM = 1 << 0;
+const SupportedInitDataTypes kSupportedInitDataTypeCenc = 1 << 1;
+const SupportedInitDataTypes kSupportedInitDataTypeKeyIds = 1 << 2;
+
 // Defines bitmask values that specify codecs used in Encrypted Media Extension
 // (EME). Each value represents a codec within a specific container.
 // The mask values are stored in a SupportedCodecs.
 enum EmeCodec {
   // *_ALL values should only be used for masking, do not use them to specify
   // codec support because they may be extended to include more codecs.
   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_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
 #if defined(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_VIDEO_ALL = EME_CODEC_MP4_AVC1,
   EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
   EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
 #else
   EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
 #endif  // defined(USE_PROPRIETARY_CODECS)
 };
 
-typedef uint32_t SupportedInitDataTypes;
 typedef uint32_t SupportedCodecs;
 
 enum EmeSessionTypeSupport {
   // Invalid default value.
   EME_SESSION_TYPE_INVALID,
   // The session type is not supported.
   EME_SESSION_TYPE_NOT_SUPPORTED,
   // The session type is supported if the encrypted media permission is granted.
   EME_SESSION_TYPE_SUPPORTED_WITH_PERMISSION,
   // The session type is always supported.
@@ skipping 16 matching lines @@
 
 enum EmeFeatureRequirement {
   EME_FEATURE_NOT_ALLOWED,
   EME_FEATURE_OPTIONAL,
   EME_FEATURE_REQUIRED,
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_EME_CONSTANTS_H_