media: Always define |cdm_id| in CdmContext.

media: Always define |cdm_id| in CdmContext.

Previously |cdm_id| is guarded by the ENABLE_BROWSER_CDMS macro, which makes a
lot of code more complicated and brings very little savings. This CL always
defines |cdm_id| to clean this up.

BUG=432998
Committed: https://crrev.com/9aa5f1b733c4d4f8ed138f0788c12c9069c87322
Cr-Commit-Position: refs/heads/master@{#321411}

[xhwang, 2015-01-05 21:45:41]

xhwang@chromium.org changed reviewers:
+ ddorwin@chromium.org

[xhwang, 2015-01-05 21:45:41]

PTAL

[ddorwin, 2015-01-05 22:59:05]

https://codereview.chromium.org/835683002/diff/1/content/renderer/media/crypt...
File content/renderer/media/crypto/ppapi_decryptor.cc (right):

https://codereview.chromium.org/835683002/diff/1/content/renderer/media/crypt...
content/renderer/media/crypto/ppapi_decryptor.cc:189: return kInvalidCdmId;
Should this be NOTREACHED()?

[xhwang, 2015-03-17 23:40:28]

https://codereview.chromium.org/835683002/diff/1/content/renderer/media/crypt...
File content/renderer/media/crypto/ppapi_decryptor.cc (right):

https://codereview.chromium.org/835683002/diff/1/content/renderer/media/crypt...
content/renderer/media/crypto/ppapi_decryptor.cc:189: return kInvalidCdmId;
On 2015/01/05 22:59:05, ddorwin wrote:
> Should this be NOTREACHED()?

Maybe, but that's very implementation dependent (e.g. the media pipeline always
call GetDecryptor() before GetCdmId()...). I think returning kInvalidCdmId is
more generic.

[ddorwin, 2015-03-19 17:24:12]

lgtm

https://codereview.chromium.org/835683002/diff/20001/media/base/cdm_context.h
File media/base/cdm_context.h (right):

https://codereview.chromium.org/835683002/diff/20001/media/base/cdm_context.h...
media/base/cdm_context.h:30: // Returns a unique ID associated with the CDM,
which can be used by the
This line could be interpreted as a DI. Please rephrase to avoid any confusion.
Perhaps be explicit that it is ephemeral or only used to associate class
instances on each side of the IPC.

[xhwang, 2015-03-19 18:25:25]

comments addressed

[xhwang, 2015-03-19 18:25:34]

https://codereview.chromium.org/835683002/diff/20001/media/base/cdm_context.h
File media/base/cdm_context.h (right):

https://codereview.chromium.org/835683002/diff/20001/media/base/cdm_context.h...
media/base/cdm_context.h:30: // Returns a unique ID associated with the CDM,
which can be used by the
On 2015/03/19 17:24:12, ddorwin wrote:
> This line could be interpreted as a DI. Please rephrase to avoid any
confusion.
> Perhaps be explicit that it is ephemeral or only used to associate class
> instances on each side of the IPC.

Done.

[xhwang, 2015-03-19 18:27:23]

The CQ bit was checked by xhwang@chromium.org

[xhwang, 2015-03-19 18:27:23]

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

[commit-bot: I haz the power, 2015-03-19 18:27:34]

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

[commit-bot: I haz the power, 2015-03-19 19:41:41]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-03-19 19:42:10]

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