Decouple MediaSession messages from WebContents (full patch)

chromecast/browser/cast_media_blocker.h

Index: chromecast/browser/cast_media_blocker.h
diff --git a/chromecast/browser/cast_media_blocker.h b/chromecast/browser/cast_media_blocker.h
index b3350603f7b1fb448130768b7a7eb26cca37b899..c253fbb1c37700f3a6b59928ea5a8a32a9f77c8a 100644
--- a/chromecast/browser/cast_media_blocker.h
+++ b/chromecast/browser/cast_media_blocker.h
@@ -6,37 +6,32 @@
 #define CHROMECAST_BROWSER_CAST_MEDIA_BLOCKER_H_
 
 #include "base/macros.h"
-#include "base/callback_forward.h"
+#include "content/public/browser/media_session_observer.h"
 #include "content/public/browser/web_contents_observer.h"
 
-namespace content {
-class WebContents;
-}  // namespace content
-
 namespace chromecast {
 namespace shell {
 
 // This class implements a blocking mode for web applications and is used in
 // Chromecast internal code. Media is unblocked by default.
-class CastMediaBlocker : public content::WebContentsObserver {
+//
+// TODO(derekjchow): Remove the inheritance from WebContentsObserver.
+// See http://crbug.com/660331
+class CastMediaBlocker : public content::MediaSessionObserver,
+                         content::WebContentsObserver {
  public:
-  explicit CastMediaBlocker(content::WebContents* web_contents);
-
-  // Constructor for test. |suspend_cb| and |resume_cb| will be called when
-  // Suspend() and Resume() are called.
-  CastMediaBlocker(content::WebContents* web_contents,
-                   const base::Closure& suspend_cb,
-                   const base::Closure& resume_cb);
-
+  explicit CastMediaBlocker(content::MediaSession* media_session,
+                            content::WebContents* web_contents);

[halliwell, 2016/10/28 23:54:45]

remove explicit

   ~CastMediaBlocker() override;
 
   // Sets if the web contents is allowed to play media or not. If media is
   // unblocked, previously suspended elements should begin playing again.
   void BlockMediaLoading(bool blocked);
 
-  // content::WebContentsObserver implementation:
+  // content::MediaSessionObserver implementation:
   void MediaSessionStateChanged(bool is_controllable,
                                 bool is_suspended) override;
+  void MediaSessionDestroyed() override;
 
  protected:
   bool media_loading_blocked() const { return blocked_; }
@@ -50,8 +45,7 @@ class CastMediaBlocker : public content::WebContentsObserver {
   void Suspend();
   void Resume();
 
-  base::Closure suspend_cb_;
-  base::Closure resume_cb_;
+  content::MediaSession* media_session_;
 
   // Whether or not media should be blocked. This value cache's the last call to
   // BlockMediaLoading. Is false by default.