Unassociating MediaSession from media players (in blink & content)

media/base/android/media_player_android.h

Index: media/base/android/media_player_android.h
diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h
index a6c5e0b7915c29acd415df618cbc073955bba60b..88e1319f45169b67d0c78b54487af3805ccc757a 100644
--- a/media/base/android/media_player_android.h
+++ b/media/base/android/media_player_android.h
@@ -26,19 +26,6 @@ namespace media {
 class MediaKeys;
 class MediaPlayerManager;
 
-enum {
-  // Id used for players not participating in any media sessions
-  // because of undefined behavior in the specification. When all
-  // media session interactions have been worked out, this id should
-  // no longer be used.
-  kInvalidMediaSessionId = -1,
-
-  // The media session for media elements that don't have an explicit
-  // user created media session set. Must be in-sync with
-  // WebMediaSession::DefaultID in blink.
-  kDefaultMediaSessionId = 0
-};
-
 // This class serves as the base class for different media player
 // implementations on Android. Subclasses need to provide their own
 // MediaPlayerAndroid::Create() implementation.
@@ -124,8 +111,6 @@ class MEDIA_EXPORT MediaPlayerAndroid {
 
   GURL frame_url() { return frame_url_; }
 
-  int media_session_id() { return media_session_id_; }
-
   // Attach/Detaches |listener_| for listening to all the media events. If
   // |j_media_player| is NULL, |listener_| only listens to the system media
   // events. Otherwise, it also listens to the events from |j_media_player|.
@@ -137,8 +122,7 @@ class MEDIA_EXPORT MediaPlayerAndroid {
       int player_id,
       MediaPlayerManager* manager,
       const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb,
-      const GURL& frame_url,
-      int media_session_id);
+      const GURL& frame_url);
 
   // TODO(qinmin): Simplify the MediaPlayerListener class to only listen to
   // media interrupt events. And have a separate child class to listen to all
@@ -192,9 +176,6 @@ class MEDIA_EXPORT MediaPlayerAndroid {
   // Listener object that listens to all the media player events.
   std::unique_ptr<MediaPlayerListener> listener_;
 
-  // Media session ID assigned to this player.
-  int media_session_id_;
-
   // Weak pointer passed to |listener_| for callbacks.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaPlayerAndroid> weak_factory_;