Pass initial CDM to CreateMediaPlayer()

Pass initial CDM to CreateMediaPlayer()

When creating a MediaPlayer, pass the initial CDM value, if there
is one. This may happen if setMediaKeys() has been called before
the MediaPlayer object is needed. The initial CDM value may be null.

BUG=358271
TEST=existing EME tests still pass

Committed: https://crrev.com/65b7d2770151a405f9fbb091e81b604920a1f798
Cr-Commit-Position: refs/heads/master@{#296510}

[jrummell, 2014-09-23 00:09:10]

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

[jrummell, 2014-09-23 00:09:11]

PTAL.

[ddorwin, 2014-09-23 18:03:23]

LGTM with comments.

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

https://codereview.chromium.org/594713002/diff/1/content/renderer/media/crypt...
content/renderer/media/crypto/encrypted_media_player_support_impl.cc:302:
DCHECK(decryptor_ready_cb_.is_null());
DCHECK(cdm) too.

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
File content/renderer/render_frame_impl.cc (right):

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
content/renderer/render_frame_impl.cc:1635:
->CreateInput(render_view_->routing_id_, routing_id_),
Undo this change. I assume it was the formatter.

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
File content/renderer/render_frame_impl.h (right):

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
content/renderer/render_frame_impl.h:275: virtual blink::WebMediaPlayer*
createMediaPlayer(
TODO: remove

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
content/renderer/render_frame_impl.h:283: blink::WebContentDecryptionModule*
cdm);
initial_cdm? Here and elsewhere as appropriate.
In Blink interface, ensure that there is a comment that it may be null.

https://codereview.chromium.org/594713002/diff/1/media/blink/null_encrypted_m...
File media/blink/null_encrypted_media_player_support.cc (right):

https://codereview.chromium.org/594713002/diff/1/media/blink/null_encrypted_m...
media/blink/null_encrypted_media_player_support.cc:53: }
DCHECK?

https://codereview.chromium.org/594713002/diff/1/media/blink/null_encrypted_m...
File media/blink/null_encrypted_media_player_support.h (right):

https://codereview.chromium.org/594713002/diff/1/media/blink/null_encrypted_m...
media/blink/null_encrypted_media_player_support.h:47: 
remove empty line

[jrummell, 2014-09-23 20:01:39]

Updated.

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

https://codereview.chromium.org/594713002/diff/1/content/renderer/media/crypt...
content/renderer/media/crypto/encrypted_media_player_support_impl.cc:302:
DCHECK(decryptor_ready_cb_.is_null());
On 2014/09/23 18:03:23, ddorwin wrote:
> DCHECK(cdm) too.

|cdm| can be null if not set when player created.

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
File content/renderer/render_frame_impl.cc (right):

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
content/renderer/render_frame_impl.cc:1635:
->CreateInput(render_view_->routing_id_, routing_id_),
On 2014/09/23 18:03:23, ddorwin wrote:
> Undo this change. I assume it was the formatter.

Done.

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
File content/renderer/render_frame_impl.h (right):

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
content/renderer/render_frame_impl.h:275: virtual blink::WebMediaPlayer*
createMediaPlayer(
On 2014/09/23 18:03:23, ddorwin wrote:
> TODO: remove

Done.

https://codereview.chromium.org/594713002/diff/1/content/renderer/render_fram...
content/renderer/render_frame_impl.h:283: blink::WebContentDecryptionModule*
cdm);
On 2014/09/23 18:03:23, ddorwin wrote:
> initial_cdm? Here and elsewhere as appropriate.
> In Blink interface, ensure that there is a comment that it may be null.

Done.

https://codereview.chromium.org/594713002/diff/1/media/blink/null_encrypted_m...
File media/blink/null_encrypted_media_player_support.cc (right):

https://codereview.chromium.org/594713002/diff/1/media/blink/null_encrypted_m...
media/blink/null_encrypted_media_player_support.cc:53: }
On 2014/09/23 18:03:23, ddorwin wrote:
> DCHECK?

Can be null.

https://codereview.chromium.org/594713002/diff/1/media/blink/null_encrypted_m...
File media/blink/null_encrypted_media_player_support.h (right):

https://codereview.chromium.org/594713002/diff/1/media/blink/null_encrypted_m...
media/blink/null_encrypted_media_player_support.h:47: 
On 2014/09/23 18:03:23, ddorwin wrote:
> remove empty line

Done.

[jrummell, 2014-09-23 20:03:58]

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

[jrummell, 2014-09-23 20:03:59]

+jamesr@ for OWNERS review of content/renderer/render_frame_impl.*

This is the matching Chromium side changes for
https://codereview.chromium.org/423633002/ that you reviewed earlier.

[ddorwin, 2014-09-23 20:08:41]

LGTM. Thanks.

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

https://codereview.chromium.org/594713002/diff/1/content/renderer/media/crypt...
content/renderer/media/crypto/encrypted_media_player_support_impl.cc:302:
DCHECK(decryptor_ready_cb_.is_null());
On 2014/09/23 20:01:38, jrummell wrote:
> On 2014/09/23 18:03:23, ddorwin wrote:
> > DCHECK(cdm) too.
> 
> |cdm| can be null if not set when player created.

Ah, yes. I was thinking we had already checked that, but that was in WMPA for
something else.

[jamesr, 2014-09-24 04:43:20]

content/renderer/r_f_i lgtm

[jrummell, 2014-09-24 17:27:19]

Thanks for the reviews.

[jrummell, 2014-09-24 17:27:29]

The CQ bit was checked by jrummell@chromium.org

[commit-bot: I haz the power, 2014-09-24 17:28:32]

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

[commit-bot: I haz the power, 2014-09-24 17:41:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-24 17:41:43]

Try jobs failed on following builders:
  android_chromium_gn_compile_dbg on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_chromiu...)
  linux_chromium_gn_rel on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[jrummell, 2014-09-24 20:19:15]

The CQ bit was checked by jrummell@chromium.org

[commit-bot: I haz the power, 2014-09-24 20:20:06]

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

[commit-bot: I haz the power, 2014-09-24 20:49:36]

Committed patchset #3 (id:40001) as e01dec8256580a5ce320f1fd7cc50c4f254dcb86

[commit-bot: I haz the power, 2014-09-24 20:50:38]

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