Android MediaSession: do not resume a UI suspended session on a system resume.

content/browser/media/android/media_session.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_SESSION_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_SESSION_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
@@ skipping 75 matching lines @@
   friend class content::WebContentsUserData<MediaSession>;
   friend class ::MediaSessionBrowserTest;
 
   // Resets the |j_media_session_| ref to prevent calling the Java backend
   // during content_browsertests.
   void ResetJavaRefForTest();
   bool IsActiveForTest() const;
   Type audio_focus_type_for_test() const;
   void RemoveAllPlayersForTest();
 
-  void OnSuspendInternal(bool temporary);
-  void OnResumeInternal();
+  enum class State {
+    ACTIVE,
+    SUSPENDED,
+    INACTIVE
+  };
 
-  enum class State {
-    Active,
-    TemporarilySuspended,
-    Suspended,
+  enum class SuspendType {
+    // Suspended by the system because a transient sound needs to be played.
+    SYSTEM,
+    // Suspended by the UI.
+    UI,
   };
 
   // Representation of a player for the MediaSession.
   struct PlayerIdentifier {
     PlayerIdentifier(MediaSessionObserver* observer, int player_id);
     PlayerIdentifier(const PlayerIdentifier&) = default;
 
     void operator=(const PlayerIdentifier&) = delete;
     bool operator==(const PlayerIdentifier& player_identifier) const;
 
     // Hash operator for base::hash_map<>.
     struct Hash {
       size_t operator()(const PlayerIdentifier& player_identifier) const;
     };
 
     MediaSessionObserver* observer;
     int player_id;
   };
   using PlayersMap = base::hash_set<PlayerIdentifier, PlayerIdentifier::Hash>;
 
   explicit MediaSession(WebContents* web_contents);
 
   // Setup the JNI.
   void Initialize();
 
+  void OnSuspendInternal(SuspendType type);
+  void OnResumeInternal(SuspendType type);
+
   // Requests audio focus to Android using |j_media_session_|.
   // Returns whether the request was granted. If |j_media_session_| is null, it
   // will always return true.
   bool RequestSystemAudioFocus(Type type);
 
   // To be called after a call to AbandonAudioFocus() in order to call the Java
   // MediaSession if the audio focus really need to be abandoned.
   void AbandonSystemAudioFocusIfNeeded();
 
   // Notifies WebContents about the state change of the media session.
   void UpdateWebContents();
 
   base::android::ScopedJavaGlobalRef<jobject> j_media_session_;
   PlayersMap players_;
 
   State audio_focus_state_;
+  SuspendType suspend_type_;
   Type audio_focus_type_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSession);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_SESSION_H_