summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorboliu <boliu@chromium.org>2014-11-13 12:12:16 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-13 20:12:42 +0000
commit409b8ba247d0157bba6b35a406c7264df5b9e660 (patch)
treeb549613c1fa0cbe256466804dcc25bf74261e935
parent1d93adc3addd7b336d541f77eb272c2aa43a7053 (diff)
downloadchromium_src-409b8ba247d0157bba6b35a406c7264df5b9e660.zip
chromium_src-409b8ba247d0157bba6b35a406c7264df5b9e660.tar.gz
chromium_src-409b8ba247d0157bba6b35a406c7264df5b9e660.tar.bz2
media: Remove jni registration DCHECKs
These DCHECKs are not valid on systems that register jni class lazily on the first Java_* method being called. Currently this is only Android WebView. See bug for more details. BUG=432939 Review URL: https://codereview.chromium.org/724153002 Cr-Commit-Position: refs/heads/master@{#304068}
-rw-r--r--media/base/android/media_player_bridge.cc4
-rw-r--r--media/base/android/media_player_listener.cc4
2 files changed, 2 insertions, 6 deletions
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index 37ea8c1..98a41543 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -504,9 +504,7 @@ void MediaPlayerBridge::OnTimeUpdateTimerFired() {
}
bool MediaPlayerBridge::RegisterMediaPlayerBridge(JNIEnv* env) {
- bool ret = RegisterNativesImpl(env);
- DCHECK(g_MediaPlayerBridge_clazz);
- return ret;
+ return RegisterNativesImpl(env);
}
bool MediaPlayerBridge::CanPause() {
diff --git a/media/base/android/media_player_listener.cc b/media/base/android/media_player_listener.cc
index b4261a8..861a34f 100644
--- a/media/base/android/media_player_listener.cc
+++ b/media/base/android/media_player_listener.cc
@@ -94,9 +94,7 @@ void MediaPlayerListener::OnMediaInterrupted(
}
bool MediaPlayerListener::RegisterMediaPlayerListener(JNIEnv* env) {
- bool ret = RegisterNativesImpl(env);
- DCHECK(g_MediaPlayerListener_clazz);
- return ret;
+ return RegisterNativesImpl(env);
}
} // namespace media