Unassociating MediaSession from media players (in blink & content)

media/base/android/media_player_android.h

 // Copyright (c) 2013 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 MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
 
 #include <jni.h>
 
 #include <memory>
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "media/base/android/media_player_listener.h"
 #include "media/base/media_export.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "url/gurl.h"
 
 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.
 class MEDIA_EXPORT MediaPlayerAndroid {
  public:
   virtual ~MediaPlayerAndroid();
 
   // Error types for MediaErrorCB.
   enum MediaErrorType {
     MEDIA_ERROR_FORMAT,
@@ skipping 65 matching lines @@
                                       const gfx::Size& video_size) {}
 
   // Overridden in MediaCodecPlayer to pass data between threads.
   virtual void OnTimeUpdate(base::TimeDelta current_timestamp,
                             base::TimeTicks current_time_ticks) {}
 
   int player_id() { return player_id_; }
 
   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|.
   void AttachListener(const base::android::JavaRef<jobject>& j_media_player);
   void DetachListener();
 
  protected:
   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
   // the events needed by MediaPlayerBridge. http://crbug.com/422597.
   // MediaPlayerListener callbacks.
   virtual void OnVideoSizeChanged(int width, int height);
   virtual void OnMediaError(int error_type);
   virtual void OnBufferingUpdate(int percent);
   virtual void OnPlaybackComplete();
   virtual void OnMediaInterrupted();
@@ skipping 33 matching lines @@
 
   // Resource manager for all the media players.
   MediaPlayerManager* manager_;
 
   // Url for the frame that contains this player.
   GURL frame_url_;
 
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_