Flash joining MediaSession (non-stack implementation)

content/browser/media/session/media_session_delegate_default.cc

Index: content/browser/media/session/media_session_delegate_default.cc
diff --git a/content/browser/media/session/media_session_delegate_default.cc b/content/browser/media/session/media_session_delegate_default.cc
index 2223d16c9227ee0a5243f751e48e1f01a50ab722..3d40b47a8bf0e2dd74acf7f181732d32e9ad9602 100644
--- a/content/browser/media/session/media_session_delegate_default.cc
+++ b/content/browser/media/session/media_session_delegate_default.cc
@@ -25,6 +25,9 @@ class MediaSessionDelegateDefault : public MediaSessionDelegate {
       AudioFocusManager::AudioFocusType audio_focus_type) override;
   void AbandonAudioFocus() override;
 
+  bool RequestPepperAudioFocus() override;
+  void AbandonPepperAudioFocus() override;
+
  private:
   // Weak pointer because |this| is owned by |media_session_|.
   MediaSession* media_session_;
@@ -49,10 +52,24 @@ bool MediaSessionDelegateDefault::RequestAudioFocus(
   return true;
 }
 
+bool MediaSessionDelegateDefault::RequestPepperAudioFocus() {
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableDefaultMediaSession)) {
+    return true;
+  }
+
+  AudioFocusManager::GetInstance()->RequestPepperAudioFocus(media_session_);
+  return true;
+}
+
 void MediaSessionDelegateDefault::AbandonAudioFocus() {
   AudioFocusManager::GetInstance()->AbandonAudioFocus(media_session_);
 }
 
+void MediaSessionDelegateDefault::AbandonPepperAudioFocus() {
+  AudioFocusManager::GetInstance()->AbandonPepperAudioFocus(media_session_);
+}
+
 // static
 std::unique_ptr<MediaSessionDelegate> MediaSessionDelegate::Create(
     MediaSession* media_session) {