[MediaSession] Keep MediaSession controllable when losing audio focus

content/browser/media/session/audio_focus_delegate_android.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/session/audio_focus_delegate_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "content/browser/media/session/media_session_impl.h"
 #include "jni/AudioFocusDelegate_jni.h"
@@ skipping 35 matching lines @@
           AudioFocusManager::AudioFocusType::GainTransientMayDuck);
 }
 
 void AudioFocusDelegateAndroid::AbandonAudioFocus() {
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
   Java_AudioFocusDelegate_abandonAudioFocus(env, j_media_session_delegate_);
 }
 
 void AudioFocusDelegateAndroid::OnSuspend(JNIEnv*,
-                                          const JavaParamRef<jobject>&,
-                                          jboolean temporary) {
-  // TODO(mlamouri): this check makes it so that if a MediaSession is paused and
-  // then loses audio focus, it will still stay in the Suspended state.
-  // See https://crbug.com/539998
+                                          const JavaParamRef<jobject>&) {
   if (!media_session_->IsActive())
     return;
 
-  if (temporary) {
-    media_session_->Suspend(MediaSession::SuspendType::SYSTEM);
-  } else {
-    media_session_->Stop(MediaSession::SuspendType::SYSTEM);
-  }
+  media_session_->Suspend(MediaSession::SuspendType::SYSTEM);
 }
 
 void AudioFocusDelegateAndroid::OnResume(JNIEnv*,
                                          const JavaParamRef<jobject>&) {
   if (!media_session_->IsReallySuspended())
     return;
 
   media_session_->Resume(MediaSession::SuspendType::SYSTEM);
 }
 
@@ skipping 14 matching lines @@
 // static
 std::unique_ptr<AudioFocusDelegate> AudioFocusDelegate::Create(
     MediaSessionImpl* media_session) {
   AudioFocusDelegateAndroid* delegate =
       new AudioFocusDelegateAndroid(media_session);
   delegate->Initialize();
   return std::unique_ptr<AudioFocusDelegate>(delegate);
 }
 
 }  // namespace content