Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

Unified Diff: content/browser/media/session/media_session_android.cc

Issue 2479703002: Another fix for MediaSessionAndroid DCHECK on destruction (Closed)
Patch Set: nit Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/session/media_session_android.cc
diff --git a/content/browser/media/session/media_session_android.cc b/content/browser/media/session/media_session_android.cc
index 74665e207eaf128446c351e11be19d694dd60775..87971b4b57015d3830030875e2cabf4453c626cb 100644
--- a/content/browser/media/session/media_session_android.cc
+++ b/content/browser/media/session/media_session_android.cc
@@ -36,10 +36,7 @@ MediaSessionAndroid::MediaSessionAndroid(MediaSessionImpl* session)
contents_android->SetMediaSession(j_media_session);
}
-MediaSessionAndroid::~MediaSessionAndroid() {
- // MediaSessionDestroyed() should have already been called.
- DCHECK(j_media_session_.is_empty());
-}
+MediaSessionAndroid::~MediaSessionAndroid() = default;
// static
bool MediaSessionAndroid::Register(JNIEnv* env) {
@@ -63,12 +60,8 @@ ScopedJavaLocalRef<jobject> GetMediaSessionFromWebContents(
void MediaSessionAndroid::MediaSessionDestroyed() {
ScopedJavaLocalRef<jobject> j_local_session = GetJavaObject();
- if (j_local_session.is_null()) {
- // If the Java MediaSession is already garbage collected, unset the weak
- // Java reference.
- j_media_session_.reset();
+ if (j_local_session.is_null())
return;
- }
JNIEnv* env = base::android::AttachCurrentThread();
// The Java object will tear down after this call.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698