Split MediaContentType and AudioFocusType

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 9e961f471b4e7f6eccaa3c81cedbf110fb852976..03590fba6ee9308224ce8b76065bb6bf16765bb3 100644
--- a/content/browser/media/session/media_session.h
+++ b/content/browser/media/session/media_session.h
@@ -18,6 +18,12 @@
 
 class MediaSessionBrowserTest;
 
+namespace media {
+
+enum class MediaContentType;
+
+}
+
 namespace content {
 
 class MediaSessionDelegate;
@@ -42,11 +48,6 @@ class MediaSessionVisibilityBrowserTest;
 class MediaSession : public WebContentsObserver,
                      protected WebContentsUserData<MediaSession> {
  public:
-  enum class Type {
-    Content,
-    Transient
-  };
-
   enum class SuspendType {
     // Suspended by the system because a transient sound needs to be played.
     SYSTEM,
@@ -56,6 +57,11 @@ class MediaSession : public WebContentsObserver,
     CONTENT,
   };
 
+  enum class AudioFocusType {
+    Content,
+    Transient
+  };

[mlamouri (slow - plz ping), 2016/08/18 14:33:15]

Maybe re-use AudioFocusType from audio_focus_manager.h? I prefer using
Gain/GrainTransientMayDuck if we split media session and audio focus behaviour.
It makes things clearer.

[Zhiqiang Zhang (Slow), 2016/08/18 17:31:45]

This is also my idea when you were preparing AudioFocusManager ;) Done.

+
   // Returns the MediaSession associated to this WebContents. Creates one if
   // none is currently available.
   CONTENT_EXPORT static MediaSession* Get(WebContents* web_contents);
@@ -69,7 +75,7 @@ class MediaSession : public WebContentsObserver,
   // player was successfully added. If it returns false, AddPlayer() should be
   // called again later.
   CONTENT_EXPORT bool AddPlayer(MediaSessionObserver* observer,
-                                int player_id, Type type);
+                                int player_id, media::MediaContentType type);
 
   // Removes the given player from the current media session. Abandons audio
   // focus if that was the last player in the session.
@@ -130,7 +136,7 @@ class MediaSession : public WebContentsObserver,
   CONTENT_EXPORT void SetDelegateForTests(
       std::unique_ptr<MediaSessionDelegate> delegate);
   CONTENT_EXPORT bool IsActiveForTest() const;
-  CONTENT_EXPORT Type audio_focus_type_for_test() const;
+  CONTENT_EXPORT AudioFocusType audio_focus_type_for_test() const;
   CONTENT_EXPORT void RemoveAllPlayersForTest();
   CONTENT_EXPORT MediaSessionUmaHelper* uma_helper_for_test();
 
@@ -168,7 +174,7 @@ class MediaSession : public WebContentsObserver,
 
   // Requests audio focus to the MediaSessionDelegate.
   // Returns whether the request was granted.
-  bool RequestSystemAudioFocus(Type type);
+  bool RequestSystemAudioFocus(AudioFocusType type);
 
   // To be called after a call to AbandonAudioFocus() in order request the
   // delegate to abandon the audio focus.
@@ -191,7 +197,7 @@ class MediaSession : public WebContentsObserver,
 
   State audio_focus_state_;
   SuspendType suspend_type_;
-  Type audio_focus_type_;
+  AudioFocusType audio_focus_type_;
 
   MediaSessionUmaHelper uma_helper_;