RemoteMediaPlayerManager: delete players on correct thread

chrome/browser/media/android/remote/remote_media_player_manager.cc

 // Copyright 2013 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 "chrome/browser/media/android/remote/remote_media_player_manager.h"
 
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/common/chrome_content_client.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 using media::MediaPlayerAndroid;
 
 namespace remote_media {
 
 RemoteMediaPlayerManager::RemoteMediaPlayerManager(
     content::RenderFrameHost* render_frame_host)
     : BrowserMediaPlayerManager(render_frame_host),
       weak_ptr_factory_(this) {
 }
 
-RemoteMediaPlayerManager::~RemoteMediaPlayerManager() {}
+RemoteMediaPlayerManager::~RemoteMediaPlayerManager() {
+  for (MediaPlayerAndroid* player : alternative_players_)
+    player->DeleteOnCorrectThread();
+
+  alternative_players_.weak_clear();
+}
 
 void RemoteMediaPlayerManager::OnStart(int player_id) {
   RemoteMediaPlayerBridge* remote_player = GetRemotePlayer(player_id);
   if (remote_player && IsPlayingRemotely(player_id))
     remote_player->Start();
 
   BrowserMediaPlayerManager::OnStart(player_id);
 }
 
 void RemoteMediaPlayerManager::OnInitialize(
@@ skipping 223 matching lines @@
     BrowserMediaPlayerManager::OnMediaMetadataChanged(player_id, duration,
                                                       width, height, success);
   }
 }
 
 bool RemoteMediaPlayerManager::IsPlayingRemotely(int player_id) {
   return players_playing_remotely_.count(player_id) != 0;
 }
 
 } // namespace remote_media