Migrating MediaSession messages to mojo

content/renderer/media/android/renderer_media_session_manager.h

Index: content/renderer/media/android/renderer_media_session_manager.h
diff --git a/content/renderer/media/android/renderer_media_session_manager.h b/content/renderer/media/android/renderer_media_session_manager.h
index d081e1b026c6a27e200b1daed5b96482427e5025..02ca290b1782e0437e82899f2a1c236ce9c2dbfc 100644
--- a/content/renderer/media/android/renderer_media_session_manager.h
+++ b/content/renderer/media/android/renderer_media_session_manager.h
@@ -14,6 +14,7 @@
 #include "content/common/content_export.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaSession.h"
+#include "third_party/WebKit/public/platform/modules/mediasession/media_session.mojom.h"
 
 namespace content {
 
@@ -25,9 +26,6 @@ class CONTENT_EXPORT RendererMediaSessionManager : public RenderFrameObserver {
   RendererMediaSessionManager(RenderFrame* render_frame);
   ~RendererMediaSessionManager() override;
 
-  // RenderFrameObserver override.
-  bool OnMessageReceived(const IPC::Message& msg) override;
-
   int RegisterMediaSession(WebMediaSessionAndroid* session);
   void UnregisterMediaSession(int session_id);
 
@@ -40,8 +38,11 @@ class CONTENT_EXPORT RendererMediaSessionManager : public RenderFrameObserver {
   void SetMetadata(
       int session_id, const base::Optional<MediaMetadata>& metadata);
 
-  void OnDidActivate(int request_id, bool success);
-  void OnDidDeactivate(int request_id);
+  void OnDidActivate(
+      std::unique_ptr<blink::WebMediaSessionActivateCallback> callback,
+      bool success);
+  void OnDidDeactivate(
+      std::unique_ptr<blink::WebMediaSessionDeactivateCallback> callback);
 
  private:
   friend class WebMediaSessionTest;
@@ -49,16 +50,12 @@ class CONTENT_EXPORT RendererMediaSessionManager : public RenderFrameObserver {
   // RenderFrameObserver implementation.
   void OnDestruct() override;
 
+  blink::mojom::MediaSessionServicePtr& GetMediaSessionService();
+
   std::map<int, WebMediaSessionAndroid*> sessions_;
   int next_session_id_;
 
-  using ActivationRequests =
-      IDMap<blink::WebMediaSessionActivateCallback, IDMapOwnPointer>;
-  ActivationRequests pending_activation_requests_;
-
-  using DeactivationRequests =
-      IDMap<blink::WebMediaSessionDeactivateCallback, IDMapOwnPointer>;
-  DeactivationRequests pending_deactivation_requests_;
+  blink::mojom::MediaSessionServicePtr media_session_service_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererMediaSessionManager);
 };