Change EmeInitDataType to be an enum class

Change EmeInitDataType to be an enum class

Mask values are seperated out into consts of type
SupportedInitDataTypes. Also removes unused function
IsSaneInitDataTypeWithContainer().

BUG=417440
TEST=EME layout tests pass

Committed: https://crrev.com/dba51339487183810b6c21387f873d5b483cfab1
Cr-Commit-Position: refs/heads/master@{#322286}

[jrummell, 2015-03-23 21:18:34]

jrummell@chromium.org changed reviewers:
+ sandersd@chromium.org

[jrummell, 2015-03-23 21:18:34]

PTAL.

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

https://codereview.chromium.org/1027363002/diff/1/content/browser/media/cdm/b...
File content/browser/media/cdm/browser_cdm_manager.cc (right):

https://codereview.chromium.org/1027363002/diff/1/content/browser/media/cdm/b...
content/browser/media/cdm/browser_cdm_manager.cc:349: media::EmeInitDataType
eme_init_data_type = media::EmeInitDataType::NONE;
I'm okay with not initializing to a value here, it's clear that every path
initializes it.

https://codereview.chromium.org/1027363002/diff/1/media/base/eme_constants.h
File media/base/eme_constants.h (right):

https://codereview.chromium.org/1027363002/diff/1/media/base/eme_constants.h#...
media/base/eme_constants.h:17: NONE,
Remove NONE.

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

https://codereview.chromium.org/1027363002/diff/1/media/base/eme_constants.h#...
media/base/eme_constants.h:23: typedef uint32_t SupportedInitDataTypes;
InitDataTypeMask

https://codereview.chromium.org/1027363002/diff/1/media/base/key_systems.cc
File media/base/key_systems.cc (right):

https://codereview.chromium.org/1027363002/diff/1/media/base/key_systems.cc#n...
media/base/key_systems.cc:315: return EmeInitDataType::NONE;
This method is only used from one place, and it's for masking. It should be the
masks that are returned.

I'm fine with either removing |kInitDataTypeNames| and its uses, or updating it
to hold mask values. Slight preference for removing entirely, because it will be
easier to switch away from a string parameter in the next CL.

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

Updated.

https://codereview.chromium.org/1027363002/diff/1/content/browser/media/cdm/b...
File content/browser/media/cdm/browser_cdm_manager.cc (right):

https://codereview.chromium.org/1027363002/diff/1/content/browser/media/cdm/b...
content/browser/media/cdm/browser_cdm_manager.cc:349: media::EmeInitDataType
eme_init_data_type = media::EmeInitDataType::NONE;
On 2015/03/23 21:27:30, sandersd wrote:
> I'm okay with not initializing to a value here, it's clear that every path
> initializes it.

Done. We'll see if any compiler complains.

https://codereview.chromium.org/1027363002/diff/1/media/base/eme_constants.h
File media/base/eme_constants.h (right):

https://codereview.chromium.org/1027363002/diff/1/media/base/eme_constants.h#...
media/base/eme_constants.h:17: NONE,
On 2015/03/23 21:27:30, sandersd wrote:
> Remove NONE.
> 
> I see that it's used in two places, I've commented in those places.

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.

https://codereview.chromium.org/1027363002/diff/1/media/base/eme_constants.h#...
media/base/eme_constants.h:23: typedef uint32_t SupportedInitDataTypes;
On 2015/03/23 21:27:30, sandersd wrote:
> InitDataTypeMask

Done.

https://codereview.chromium.org/1027363002/diff/1/media/base/key_systems.cc
File media/base/key_systems.cc (right):

https://codereview.chromium.org/1027363002/diff/1/media/base/key_systems.cc#n...
media/base/key_systems.cc:315: return EmeInitDataType::NONE;
On 2015/03/23 21:27:30, sandersd wrote:
> This method is only used from one place, and it's for masking. It should be
the
> masks that are returned.
> 
> I'm fine with either removing |kInitDataTypeNames| and its uses, or updating
it
> to hold mask values. Slight preference for removing entirely, because it will
be
> easier to switch away from a string parameter in the next CL.

In the future calls to IsSupportedKeySystemWithInitDataType() below will pass in
the EMEInitDataType rather than a string, so there will still need to be a
conversion.

As well, it will get used publicly in the next CL to convert the strings until
everything is converted to the enum. Leaving it as is until is can be completely
removed.

[sandersd (OOO until July 31), 2015-03-25 22:01:29]

lgtm

https://codereview.chromium.org/1027363002/diff/1/content/browser/media/cdm/b...
File content/browser/media/cdm/browser_cdm_manager.cc (right):

https://codereview.chromium.org/1027363002/diff/1/content/browser/media/cdm/b...
content/browser/media/cdm/browser_cdm_manager.cc:349: media::EmeInitDataType
eme_init_data_type = media::EmeInitDataType::NONE;
On 2015/03/25 21:44:24, jrummell wrote:
> On 2015/03/23 21:27:30, sandersd wrote:
> > I'm okay with not initializing to a value here, it's clear that every path
> > initializes it.
> 
> Done. We'll see if any compiler complains.

If you're leaving UNKNOWN in then it's fine to initialize to that.

[jrummell, 2015-03-25 23:02:59]

jrummell@chromium.org changed reviewers:
+ ddorwin@chromium.org, gunsch@chromium.org

[jrummell, 2015-03-25 23:03:00]

+gunsch@ for changes in chromecast/renderer
+ddorwin@ for changes in components/cdm and content/browser

[ddorwin, 2015-03-25 23:13:20]

components/cdm/renderer/ and content/browser/media/cdm/browser_cdm_manager.cc
LGTM

[gunsch, 2015-03-25 23:21:23]

lgtm for chromecast/

[jrummell, 2015-03-25 23:24:42]

The CQ bit was checked by jrummell@chromium.org

[jrummell, 2015-03-25 23:24:42]

The patchset sent to the CQ was uploaded after l-g-t-m from
sandersd@chromium.org
Link to the patchset: https://codereview.chromium.org/1027363002/#ps40001
(title: "rebase")

[commit-bot: I haz the power, 2015-03-25 23:25:21]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1027363002/40001

[commit-bot: I haz the power, 2015-03-26 01:11:22]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-03-26 01:12:04]

Patchset 3 (id:??) landed as
https://crrev.com/dba51339487183810b6c21387f873d5b483cfab1
Cr-Commit-Position: refs/heads/master@{#322286}