| Index: content/renderer/media/android/renderer_media_player_manager.cc
|
| diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
|
| index 18b033269d7c005384916c26c5edad93f3209ac6..c4642bae3497e54494fb49ec5063f5687138663f 100644
|
| --- a/content/renderer/media/android/renderer_media_player_manager.cc
|
| +++ b/content/renderer/media/android/renderer_media_player_manager.cc
|
| @@ -8,9 +8,7 @@
|
| #include "content/common/media/media_player_messages_android.h"
|
| #include "content/public/common/renderer_preferences.h"
|
| #include "content/renderer/media/android/webmediaplayer_android.h"
|
| -#include "content/renderer/media/cdm/renderer_cdm_manager.h"
|
| #include "content/renderer/render_view_impl.h"
|
| -#include "media/base/cdm_context.h"
|
| #include "media/base/media_switches.h"
|
| #include "ui/gfx/geometry/rect_f.h"
|
|
|
| @@ -242,14 +240,6 @@ void RendererMediaPlayerManager::EnterFullscreen(int player_id) {
|
| Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id));
|
| }
|
|
|
| -void RendererMediaPlayerManager::SetCdm(int player_id, int cdm_id) {
|
| - if (cdm_id == media::CdmContext::kInvalidCdmId) {
|
| - NOTREACHED();
|
| - return;
|
| - }
|
| - Send(new MediaPlayerHostMsg_SetCdm(routing_id(), player_id, cdm_id));
|
| -}
|
| -
|
| int RendererMediaPlayerManager::RegisterMediaPlayer(
|
| media::RendererMediaPlayerInterface* player) {
|
| media_players_[next_media_player_id_] = player;
|
|
|