Reland: Pass initDataType instead of contentType to OnNeedKey().
commit22851a415bff2a92fa24c2794ffc768188137a3c
authorsandersd <sandersd@chromium.org>
Thu, 2 Oct 2014 18:49:44 +0000 (2 11:49 -0700)
committerCommit bot <commit-bot@chromium.org>
Thu, 2 Oct 2014 18:50:06 +0000 (2 18:50 +0000)
tree37a341b4defd2ec6c348b762136c7564c1aeb2ad
parent71a42ec15abb539b215e075e645e940bf1084398
Reland: Pass initDataType instead of contentType to OnNeedKey().

BUG=224786
Cr-Commit-Position: refs/heads/master@{#297523}
(cherry picked from commit 2983dc91cc0bc7be6014f4bfc5cb19cc6e262a0b)

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

Cr-Commit-Position: refs/heads/master@{#297872}
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