Remove secondary player from Media Sessions

content/browser/media/android/media_web_contents_observer_android.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/android/media_web_contents_observer_android.h"
 
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/media/android/browser_media_session_manager.h"
 #include "content/browser/media/android/browser_surface_view_manager.h"
 #include "content/browser/media/android/media_session.h"
@@ skipping 82 matching lines @@
     bool has_audio,
     bool is_remote,
     base::TimeDelta duration) {
   // |has_video| forced to true since the value doesn't matter at present.
   OnMediaPlaying(render_frame_host, delegate_id, true, has_audio, is_remote,
                  duration);
   return media_session_map_.find(MediaPlayerId(
              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();
        it != media_player_managers_.end(); ++it) {
     it->second->OnFrameInfoUpdated();
   }
 }
 #endif  // defined(VIDEO_HOLE)
 
 void MediaWebContentsObserverAndroid::RenderFrameDeleted(
@@ skipping 240 matching lines @@
   scoped_ptr<MediaSessionController> controller(
       new MediaSessionController(id, this));
 
   if (!controller->Initialize(has_audio, is_remote, duration))
     return;
 
   media_session_map_[id] = std::move(controller);
 }
 
 }  // namespace content