Remove secondary player from Media Sessions

content/browser/media/android/media_web_contents_observer_android.cc

Index: content/browser/media/android/media_web_contents_observer_android.cc
diff --git a/content/browser/media/android/media_web_contents_observer_android.cc b/content/browser/media/android/media_web_contents_observer_android.cc
index 819c6b4ba367dbb97644167f391904b91b90c730..581cf41165e81e281d3cd610b2594d48d99e13fd 100644
--- a/content/browser/media/android/media_web_contents_observer_android.cc
+++ b/content/browser/media/android/media_web_contents_observer_android.cc
@@ -100,6 +100,13 @@ bool MediaWebContentsObserverAndroid::RequestPlay(
              render_frame_host, delegate_id)) != media_session_map_.end();
 }
 
+void MediaWebContentsObserverAndroid::DisconnectMediaSession(
+    RenderFrameHost* render_frame_host,
+    int delegate_id) {
+  session_controllers_manager()->OnEnd(

[boliu, 2016/03/29 17:33:57]

This doesn't build on m50 branch. session_controllers_manager() was addedin
https://codereview.chromium.org/1698933004/, which is not in the m50 branch.

There seem to be another merge on top of it, so just reverting isn't great
either. Is there an easy fix?

+      MediaPlayerId(render_frame_host, delegate_id));
+}
+
 #if defined(VIDEO_HOLE)
 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() {
   for (auto it = media_player_managers_.begin();