Decouple MediaSession messages from WebContents (full patch)

content/browser/media/session/media_session_controller_unittest.cc

Index: content/browser/media/session/media_session_controller_unittest.cc
diff --git a/content/browser/media/session/media_session_controller_unittest.cc b/content/browser/media/session/media_session_controller_unittest.cc
index 88b721ead50b49f29e20152aa632c65e1149383d..c2c2868ab12c738fa09a152ab175fd8f6c03ed10 100644
--- a/content/browser/media/session/media_session_controller_unittest.cc
+++ b/content/browser/media/session/media_session_controller_unittest.cc
@@ -5,8 +5,8 @@
 #include <tuple>
 
 #include "content/browser/media/media_web_contents_observer.h"
-#include "content/browser/media/session/media_session.h"
 #include "content/browser/media/session/media_session_controller.h"
+#include "content/browser/media/session/media_session_impl.h"
 #include "content/common/media/media_player_delegate_messages.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
@@ -35,7 +35,9 @@ class MediaSessionControllerTest : public RenderViewHostImplTestHarness {
         id_, contents()->media_web_contents_observer()));
   }
 
-  MediaSession* media_session() { return MediaSession::Get(contents()); }
+  MediaSessionImpl* media_session() {
+    return MediaSessionImpl::Get(contents());
+  }
 
   IPC::TestSink& test_sink() { return main_test_rfh()->GetProcess()->sink(); }