Revert of Pass initDataType instead of contentType on OnNeedKey(). (patchset #4 id...
commitde394fa4553674e0aa522ce7c3483394f0f40d3d
authorzmo <zmo@chromium.org>
Tue, 30 Sep 2014 23:20:30 +0000 (30 16:20 -0700)
committerCommit bot <commit-bot@chromium.org>
Tue, 30 Sep 2014 23:20:46 +0000 (30 23:20 +0000)
tree63972c851107a4ffba6159cbf8faad69e99c14ec
parentca73bb0e2d9f84c5dbcb738d1fca0e34269651f2
Revert of Pass initDataType instead of contentType on OnNeedKey(). (patchset #4 id:60001 of https://codereview.chromium.org/611513005/)

Reason for revert:
This broke media/encrypted-media/encrypted-media-needkey.html on Linux (at least)

Original issue's description:
> Pass initDataType instead of contentType to OnNeedKey().
>
> BUG=224786
>
> Committed: https://crrev.com/2983dc91cc0bc7be6014f4bfc5cb19cc6e262a0b
> Cr-Commit-Position: refs/heads/master@{#297523}

TBR=ddorwin@chromium.org,sandersd@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=224786

Review URL: https://codereview.chromium.org/616183002

Cr-Commit-Position: refs/heads/master@{#297538}
content/renderer/media/android/webmediaplayer_android.cc
content/renderer/media/crypto/encrypted_media_player_support_impl.cc
content/renderer/media/crypto/proxy_decryptor.cc
content/renderer/media/crypto/proxy_decryptor.h
media/filters/pipeline_integration_test.cc
media/formats/mp4/mp4_stream_parser.cc
media/formats/mp4/mp4_stream_parser_unittest.cc
media/formats/webm/webm_crypto_helpers.h