Decouple MediaSession messages from WebContents (full patch)

content/browser/media/session/pepper_playback_observer.cc

Index: content/browser/media/session/pepper_playback_observer.cc
diff --git a/content/browser/media/session/pepper_playback_observer.cc b/content/browser/media/session/pepper_playback_observer.cc
index 53af5324468df7f565c20b719462bb23615d858d..440157b04f2f5685e4a0d9a1d70c1798c3d6988b 100644
--- a/content/browser/media/session/pepper_playback_observer.cc
+++ b/content/browser/media/session/pepper_playback_observer.cc
@@ -6,7 +6,7 @@
 
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
-#include "content/browser/media/session/media_session.h"
+#include "content/browser/media/session/media_session_impl.h"
 #include "content/browser/media/session/pepper_player_delegate.h"
 #include "content/common/frame_messages.h"
 #include "ipc/ipc_message_macros.h"
@@ -35,7 +35,7 @@ PepperPlaybackObserver::~PepperPlaybackObserver() {
   // RenderViewHost has been destroyed.
   for (PlayersMap::iterator iter = players_map_.begin();
        iter != players_map_.end();) {
-    MediaSession::Get(contents_)->RemovePlayer(
+    MediaSessionImpl::Get(contents_)->RemovePlayer(
         iter->second.get(), PepperPlayerDelegate::kPlayerId);
     iter = players_map_.erase(iter);
   }
@@ -62,17 +62,17 @@ void PepperPlaybackObserver::PepperStartsPlayback(int32_t pp_instance) {
   players_map_[pp_instance].reset(new PepperPlayerDelegate(
       contents_, pp_instance));
 
-  MediaSession::Get(contents_)->AddPlayer(
+  MediaSessionImpl::Get(contents_)->AddPlayer(
       players_map_[pp_instance].get(), PepperPlayerDelegate::kPlayerId,
       ShouldDuckFlash() ? media::MediaContentType::Pepper
-                    : media::MediaContentType::Persistent);
+                        : media::MediaContentType::Persistent);
 }
 
 void PepperPlaybackObserver::PepperStopsPlayback(int32_t pp_instance) {
   if (!players_map_.count(pp_instance))
     return;
 
-  MediaSession::Get(contents_)->RemovePlayer(
+  MediaSessionImpl::Get(contents_)->RemovePlayer(
       players_map_[pp_instance].get(), PepperPlayerDelegate::kPlayerId);
 
   players_map_.erase(pp_instance);