Revert 262568 "Encrypted Media: Check container mime type in Med..."
commit7f706d33bf32c7cacb5b7eaf3b8029e8b1983c12
authordmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Wed, 9 Apr 2014 05:59:31 +0000 (9 05:59 +0000)
committerdmazzoni@google.com <dmazzoni@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Wed, 9 Apr 2014 05:59:31 +0000 (9 05:59 +0000)
tree7c4e30a17b99f8f7abad5dc547b7b331536983c6
parentee4440330949f3cdffdaab07306a096b967b9e32
Revert 262568 "Encrypted Media: Check container mime type in Med..."

causing media_unittests to crash
NullPointerException at org.chromium.media.MediaCodecBridge.dequeueOutputBuffer(MediaCodecBridge.java:420)
http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20Tests&number=13008

> Encrypted Media: Check container mime type in MediaDrmBridge.
>
> Android MediaDrm API supports container mime type check in
> isCryptoSchemeSupported (UUID uuid, String mimeType):
>
> http://developer.android.com/reference/android/media/MediaDrm.html#isCryptoSchemeSupported(java.util.UUID, java.lang.String)
>
> This CL hook this API up in MediaDrmBridge.
>
> Also, Chromium will always query the codec/container type it
> is interested in (e.g. MP4 and WebM).
>
> BUG=350481
>
> Review URL: https://codereview.chromium.org/229203002

TBR=xhwang@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262628 0039d316-1c4b-4281-b951-d872f2087c98
chrome/browser/media/encrypted_media_message_filter_android.cc
chrome/renderer/media/chrome_key_systems.cc
content/browser/media/android/browser_media_player_manager.cc
media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
media/base/android/media_drm_bridge.cc
media/base/android/media_drm_bridge.h
media/base/android/media_drm_bridge_unittest.cc