Make MediaSession available on Desktop

content/browser/media/android/media_web_contents_observer_android.h

Index: content/browser/media/android/media_web_contents_observer_android.h
diff --git a/content/browser/media/android/media_web_contents_observer_android.h b/content/browser/media/android/media_web_contents_observer_android.h
index 7298f4fa2bc7e04c233496c047e1f2524ca4ab3d..14ea142526bb293d0bd82ef2fddc2ae77903f71c 100644
--- a/content/browser/media/android/media_web_contents_observer_android.h
+++ b/content/browser/media/android/media_web_contents_observer_android.h
@@ -9,7 +9,6 @@
 
 #include <memory>
 
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "content/browser/media/media_web_contents_observer.h"
 #include "content/common/content_export.h"
@@ -21,7 +20,6 @@ enum class MediaContentType;
 namespace content {
 
 class BrowserMediaPlayerManager;
-class BrowserMediaSessionManager;
 class BrowserSurfaceViewManager;
 
 // This class adds Android specific extensions to the MediaWebContentsObserver.
@@ -40,17 +38,9 @@ class CONTENT_EXPORT MediaWebContentsObserverAndroid
   // returned pointer.
   BrowserMediaPlayerManager* GetMediaPlayerManager(
       RenderFrameHost* render_frame_host);
-  BrowserMediaSessionManager* GetMediaSessionManager(
-      RenderFrameHost* render_frame_host);
   BrowserSurfaceViewManager* GetSurfaceViewManager(
       RenderFrameHost* render_frame_host);
 
-  // Sets or overrides the BrowserMediaSessionManager for the given
-  // |render_frame_host|.
-  void SetMediaSessionManagerForTest(
-      RenderFrameHost* render_frame_host,
-      std::unique_ptr<BrowserMediaSessionManager> manager);
-
   // Called by the WebContents when a tab has been closed but may still be
   // available for "undo" -- indicates that all media players (even audio only
   // players typically allowed background audio) bound to this WebContents must
@@ -90,12 +80,6 @@ class CONTENT_EXPORT MediaWebContentsObserverAndroid
                              std::unique_ptr<BrowserMediaPlayerManager>>;
   MediaPlayerManagerMap media_player_managers_;
 
-  // Map from RenderFrameHost* to BrowserMediaSessionManager.
-  using MediaSessionManagerMap =
-      base::ScopedPtrHashMap<RenderFrameHost*,
-                             std::unique_ptr<BrowserMediaSessionManager>>;
-  MediaSessionManagerMap media_session_managers_;
-
   using SurfaceViewManagerMap =
       base::ScopedPtrHashMap<RenderFrameHost*,
                              std::unique_ptr<BrowserSurfaceViewManager>>;