Decouple MediaSession/MediaSessionObserver from WebContents in Java[OBSOLETE, go to the combined CL]

content/browser/media/session/media_session_impl.h

Index: content/browser/media/session/media_session_impl.h
diff --git a/content/browser/media/session/media_session_impl.h b/content/browser/media/session/media_session_impl.h
index 445e5184c92fcb4e0cf77ae3d0428724215f564b..1123f9ee42b717e6c8693f7e6d0cebab93af50b3 100644
--- a/content/browser/media/session/media_session_impl.h
+++ b/content/browser/media/session/media_session_impl.h
@@ -21,6 +21,10 @@
 #include "content/public/browser/web_contents_user_data.h"
 #include "content/public/common/media_metadata.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/scoped_java_ref.h"
+#endif  // defined(OS_ANDROID)
+
 class MediaSessionImplBrowserTest;
 
 namespace media {
@@ -31,10 +35,14 @@ namespace content {
 
 class AudioFocusDelegate;
 class AudioFocusManagerTest;
-class MediaSessionPlayerObserver;
 class MediaSessionImplStateObserver;
 class MediaSessionImplVisibilityBrowserTest;
 class MediaSessionObserver;
+class MediaSessionPlayerObserver;
+
+#if defined(OS_ANDROID)
+class MediaSessionAndroid;
+#endif  // defined(OS_ANDROID)
 
 // MediaSessionImpl is the implementation of MediaSession. It manages the media
 // session and audio focus for a given WebContents. It is requesting the audio
@@ -64,6 +72,14 @@ class MediaSessionImpl : public MediaSession,
 
   ~MediaSessionImpl() override;
 
+#if defined(OS_ANDROID)
+  static MediaSession* FromJavaMediaSession(
+      const base::android::JavaRef<jobject>& j_media_session);
+  MediaSessionAndroid* session_android() const {
+    return session_android_.get();
+  }
+#endif  // defined(OS_ANDROID)
+
   void AddObserver(MediaSessionObserver* observer);
   void RemoveObserver(MediaSessionObserver* observer);
 
@@ -235,6 +251,10 @@ class MediaSessionImpl : public MediaSession,
 
   base::ObserverList<MediaSessionObserver> observers_;
 
+#if defined(OS_ANDROID)
+  std::unique_ptr<MediaSessionAndroid> session_android_;
+#endif  // defined(OS_ANDROID)
+
   DISALLOW_COPY_AND_ASSIGN(MediaSessionImpl);
 };