Hook up RendererMediaSessionManager with browser side

content/renderer/media/android/renderer_media_session_manager.cc

Index: content/renderer/media/android/renderer_media_session_manager.cc
diff --git a/content/renderer/media/android/renderer_media_session_manager.cc b/content/renderer/media/android/renderer_media_session_manager.cc
index c39c0dce2eefb66c02a5da977e8228ee2f888853..a71131ebacc43a8c500696516a5ae03bb4a53bfc 100644
--- a/content/renderer/media/android/renderer_media_session_manager.cc
+++ b/content/renderer/media/android/renderer_media_session_manager.cc
@@ -5,6 +5,8 @@
 #include "content/renderer/media/android/renderer_media_session_manager.h"
 
 #include "base/logging.h"
+#include "content/common/media/media_session_messages_android.h"
+#include "content/public/renderer/render_thread.h"
 #include "content/renderer/media/android/webmediasession_android.h"
 
 namespace content {
@@ -22,6 +24,35 @@ RendererMediaSessionManager::~RendererMediaSessionManager() {
          "destroyed only after all media sessions are destroyed.";
 }
 
+bool RendererMediaSessionManager::OnMessageReceived(const IPC::Message& msg) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(RendererMediaSessionManager, msg)
+    IPC_MESSAGE_HANDLER(MediaSessionMsg_DidActivate, OnDidActivate)
+    IPC_MESSAGE_HANDLER(MediaSessionMsg_DidDeactivate, OnDidDeactivate)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
+void RendererMediaSessionManager::OnDidActivate(int session_id,
+                                                int activation_id,
+                                                bool success) {
+  std::map<int, WebMediaSessionAndroid*>::iterator iter =
+      sessions_.find(session_id);
+
+  if (iter != sessions_.end())
+    iter->second->OnDidActivate(activation_id, success);
+}
+
+void RendererMediaSessionManager::OnDidDeactivate(int session_id,
+                                                  int deactivation_id) {
+  std::map<int, WebMediaSessionAndroid*>::iterator iter =
+      sessions_.find(session_id);
+
+  if (iter != sessions_.end())
+    iter->second->OnDidDeactivate(deactivation_id);
+}
+
 int RendererMediaSessionManager::RegisterMediaSession(
     WebMediaSessionAndroid* session) {
   sessions_[next_session_id_] = session;
@@ -32,4 +63,24 @@ void RendererMediaSessionManager::UnregisterMediaSession(int session_id) {
   sessions_.erase(session_id);
 }
 
+void RendererMediaSessionManager::Activate(int session_id, int activation_id) {

[mlamouri (slow - plz ping), 2015/11/30 12:38:20]

nit: keep order from header file. ::Activate() and ::Deactivate() are above
::OnActivate() and ::OnDeactivate()

[davve, 2015/11/30 14:19:48]

Done.

+  Send(new MediaSessionHostMsg_Activate(routing_id(), session_id,
+                                        activation_id));
+}
+
+void RendererMediaSessionManager::Deactivate(int session_id,
+                                             int deactivation_id) {
+  Send(new MediaSessionHostMsg_Deactivate(routing_id(), session_id,
+                                          deactivation_id));
+}
+
+bool RendererMediaSessionManager::Send(IPC::Message* message) {

[mlamouri (slow - plz ping), 2015/11/30 12:38:20]

Why don't you use the RenderFrameObserver implementation?

[davve, 2015/11/30 14:19:48]

That's a really good question. Done.

+  if (!RenderThread::Get()) {
+    delete message;
+    return false;
+  }
+
+  return RenderThread::Get()->Send(message);
+}
+
 }  // namespace content