Split MediaContentType and AudioFocusType

content/browser/media/session/media_session_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/media_session_delegate_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "jni/MediaSessionDelegate_jni.h"
 
@@ skipping 19 matching lines @@
 
 void MediaSessionDelegateAndroid::Initialize() {
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
   j_media_session_delegate_.Reset(Java_MediaSessionDelegate_create(
       env,
       base::android::GetApplicationContext(),
       reinterpret_cast<intptr_t>(this)));
 }
 
-bool MediaSessionDelegateAndroid::RequestAudioFocus(MediaSession::Type type) {
+bool MediaSessionDelegateAndroid::RequestAudioFocus(
+    AudioFocusManager::AudioFocusType type) {
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
   return Java_MediaSessionDelegate_requestAudioFocus(
-      env, j_media_session_delegate_, type == MediaSession::Type::Transient);
+      env, j_media_session_delegate_,
+      type == AudioFocusManager::AudioFocusType::GainTransientMayDuck);
 }
 
 void MediaSessionDelegateAndroid::AbandonAudioFocus() {
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
   Java_MediaSessionDelegate_abandonAudioFocus(env, j_media_session_delegate_);
 }
 
 void MediaSessionDelegateAndroid::OnSuspend(
     JNIEnv*, const JavaParamRef<jobject>&, jboolean temporary) {
@@ skipping 31 matching lines @@
 // static
 std::unique_ptr<MediaSessionDelegate> MediaSessionDelegate::Create(
     MediaSession* media_session) {
   MediaSessionDelegateAndroid* delegate =
       new MediaSessionDelegateAndroid(media_session);
   delegate->Initialize();
   return std::unique_ptr<MediaSessionDelegate>(delegate);
 }
 
 }  // namespace content