diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
| commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
| tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/media/base/android/media_jni_registrar.cc | |
| parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) | |
| download | qtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz | |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/media/base/android/media_jni_registrar.cc')
| -rw-r--r-- | chromium/media/base/android/media_jni_registrar.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chromium/media/base/android/media_jni_registrar.cc b/chromium/media/base/android/media_jni_registrar.cc index b7d48ca0737..93a46c3b545 100644 --- a/chromium/media/base/android/media_jni_registrar.cc +++ b/chromium/media/base/android/media_jni_registrar.cc @@ -10,7 +10,6 @@ #include "media/audio/android/audio_manager_android.h" #include "media/base/android/media_codec_bridge.h" -#include "media/base/android/media_drm_bridge.h" #include "media/base/android/media_player_bridge.h" #include "media/base/android/media_player_listener.h" #include "media/base/android/webaudio_media_codec_bridge.h" @@ -23,8 +22,6 @@ static base::android::RegistrationMethod kMediaRegisteredMethods[] = { AudioManagerAndroid::RegisterAudioManager }, { "MediaCodecBridge", MediaCodecBridge::RegisterMediaCodecBridge }, - { "MediaDrmBridge", - MediaDrmBridge::RegisterMediaDrmBridge }, { "MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge }, { "MediaPlayerListener", |