| Index: content/browser/media/android/media_session.h
|
| diff --git a/content/browser/media/android/media_session.h b/content/browser/media/android/media_session.h
|
| index b0a1157c52cc3e48dc0dee2fea67ca51349f7b9f..559b8d4a15d9a9ffaf1afbfacf918fd4a346a515 100644
|
| --- a/content/browser/media/android/media_session.h
|
| +++ b/content/browser/media/android/media_session.h
|
| @@ -104,14 +104,6 @@ class CONTENT_EXPORT MediaSession
|
| friend class content::WebContentsUserData<MediaSession>;
|
| friend class ::MediaSessionBrowserTest;
|
|
|
| - // Resets the |j_media_session_| ref to prevent calling the Java backend
|
| - // during content_browsertests.
|
| - void ResetJavaRefForTest();
|
| - bool IsActiveForTest() const;
|
| - Type audio_focus_type_for_test() const;
|
| - void RemoveAllPlayersForTest();
|
| - MediaSessionUmaHelper* uma_helper_for_test();
|
| -
|
| enum class State {
|
| ACTIVE,
|
| SUSPENDED,
|
| @@ -173,6 +165,10 @@ class CONTENT_EXPORT MediaSession
|
| base::android::ScopedJavaGlobalRef<jobject> j_media_session_;
|
| PlayersMap players_;
|
|
|
| + // The value returned by RequestSystemAudioFocus() when |j_media_session_| is
|
| + // unavailable. Used for testing.
|
| + bool default_system_audio_focus_response_;
|
| +
|
| State audio_focus_state_;
|
| SuspendType suspend_type_;
|
| Type audio_focus_type_;
|
|
|