Flash joining MediaSession (non-stack implementation)

content/browser/media/session/media_session.h

Index: content/browser/media/session/media_session.h
diff --git a/content/browser/media/session/media_session.h b/content/browser/media/session/media_session.h
index d791c61eacc54dde1bfc4437a7223ad0be8f1638..638796bb78c1340337ff8c6d8417f89e82386312 100644
--- a/content/browser/media/session/media_session.h
+++ b/content/browser/media/session/media_session.h
@@ -106,6 +106,8 @@ class MediaSession : public WebContentsObserver,
   // Change the volume multiplier of the session to |volume_multiplier|.
   CONTENT_EXPORT void SetVolumeMultiplier(double volume_multiplier);
 
+  CONTENT_EXPORT void SetPepperVolumeMultiplier(double volume_multiplier);
+
   // Returns if the session can be controlled by Resume() and Suspend calls
   // above.
   CONTENT_EXPORT bool IsControllable() const;
@@ -171,6 +173,8 @@ class MediaSession : public WebContentsObserver,
                                         State new_state);
   CONTENT_EXPORT void OnResumeInternal(SuspendType suspend_type);
 
+  bool AddPepperPlayer(MediaSessionObserver* observer, int player_id);
+
   // Requests audio focus to the MediaSessionDelegate.
   // Returns whether the request was granted.
   bool RequestSystemAudioFocus(
@@ -194,6 +198,7 @@ class MediaSession : public WebContentsObserver,
 
   std::unique_ptr<MediaSessionDelegate> delegate_;
   PlayersMap players_;
+  PlayersMap pepper_players_;
 
   State audio_focus_state_;
   SuspendType suspend_type_;