[MediaSession, Android] Adding visibility tests for MediaSession

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 2553c6d7885d58e9b1159201568cdb02d7f9256d..6485672cda7dd01e9a227b89d89f9ca00609450a 100644
--- a/content/browser/media/session/media_session.h
+++ b/content/browser/media/session/media_session.h
@@ -7,6 +7,7 @@
 
 #include <stddef.h>
 
+#include "base/callback_list.h"
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "content/browser/media/session/media_session_uma_helper.h"
@@ -21,6 +22,8 @@ namespace content {
 
 class MediaSessionDelegate;
 class MediaSessionObserver;
+class MediaSessionStateObserver;
+class MediaSessionVisibilityBrowserTestBase;
 
 // MediaSession manages the media session and audio focus for a given
 // WebContents. It is requesting the audio focus, pausing when requested by the
@@ -123,6 +126,8 @@ class MediaSession : public WebContentsObserver,
  private:
   friend class content::WebContentsUserData<MediaSession>;
   friend class ::MediaSessionBrowserTest;
+  friend class content::MediaSessionVisibilityBrowserTestBase;
+  friend class content::MediaSessionStateObserver;
 
   CONTENT_EXPORT void SetDelegateForTests(
       scoped_ptr<MediaSessionDelegate> delegate);
@@ -154,6 +159,7 @@ class MediaSession : public WebContentsObserver,
     int player_id;
   };
   using PlayersMap = base::hash_set<PlayerIdentifier, PlayerIdentifier::Hash>;
+  typedef base::Callback<void(State)> StateChangedCallback;

[DaleCurtis, 2016/03/31 16:50:26]

as of c++11 we use 'using' now, check out http://chromium-cpp.appspot.com

[Zhiqiang Zhang (Slow), 2016/03/31 19:58:39]

Done.

 
   CONTENT_EXPORT explicit MediaSession(WebContents* web_contents);
 
@@ -177,6 +183,11 @@ class MediaSession : public WebContentsObserver,
   // It sets audio_focus_state_ and notifies observers about the state change.
   void SetAudioFocusState(State audio_focus_state);
 
+  // Registers a MediaSession state change callback.
+  CONTENT_EXPORT scoped_ptr<base::CallbackList<void(State)>::Subscription>
+  RegisterMediaSessionStateChangedCallbackForTest(
+      const StateChangedCallback& cb);
+
   scoped_ptr<MediaSessionDelegate> delegate_;
   PlayersMap players_;
 
@@ -191,6 +202,7 @@ class MediaSession : public WebContentsObserver,
   double volume_multiplier_;
 
   MediaMetadata metadata_;
+  base::CallbackList<void(State)> media_session_state_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSession);
 };