Decouple MediaSession messages from WebContents (full patch)

content/browser/media/session/audio_focus_delegate_android.cc

 // Copyright 2016 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.
 
 #include "content/browser/media/session/audio_focus_delegate_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
+#include "content/browser/media/session/media_session_impl.h"
 #include "jni/AudioFocusDelegate_jni.h"
 
 using base::android::JavaParamRef;
 
 namespace content {
 
 // static
 bool AudioFocusDelegateAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 AudioFocusDelegateAndroid::AudioFocusDelegateAndroid(
-    MediaSession* media_session)
+    MediaSessionImpl* media_session)
     : media_session_(media_session) {}
 
 AudioFocusDelegateAndroid::~AudioFocusDelegateAndroid() {
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
   Java_AudioFocusDelegate_tearDown(env, j_media_session_delegate_);
 }
 
 void AudioFocusDelegateAndroid::Initialize() {
   JNIEnv* env = base::android::AttachCurrentThread();
@@ skipping 52 matching lines @@
 }
 
 void AudioFocusDelegateAndroid::RecordSessionDuck(
     JNIEnv*,
     const JavaParamRef<jobject>&) {
   media_session_->RecordSessionDuck();
 }
 
 // static
 std::unique_ptr<AudioFocusDelegate> AudioFocusDelegate::Create(
-    MediaSession* media_session) {
+    MediaSessionImpl* media_session) {
   AudioFocusDelegateAndroid* delegate =
       new AudioFocusDelegateAndroid(media_session);
   delegate->Initialize();
   return std::unique_ptr<AudioFocusDelegate>(delegate);
 }
 
 }  // namespace content