Chromium Code Reviews| Index: content/renderer/media/android/webmediaplayer_android.cc |
| diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc |
| index e2b9e7e9c53f62be1264f3b97f4534222d6dfc22..f1032f252ef734d42eec46e7c3446e885de68980 100644 |
| --- a/content/renderer/media/android/webmediaplayer_android.cc |
| +++ b/content/renderer/media/android/webmediaplayer_android.cc |
| @@ -25,6 +25,7 @@ |
| #include "content/renderer/media/android/renderer_demuxer_android.h" |
| #include "content/renderer/media/android/renderer_media_player_manager.h" |
| #include "content/renderer/media/crypto/key_systems.h" |
| +#include "content/renderer/media/crypto/render_cdm_factory.h" |
|
ddorwin
2014/10/16 17:32:51
I really dislike "Render" as a noun. It is a verb
xhwang
2014/10/16 20:08:39
render is used more often than renderer, e.g. rend
ddorwin
2014/10/16 20:33:20
It's about 40/60 in that directory. I would argue
xhwang
2014/10/17 00:11:48
I think we had this discussion before and didn't g
|
| #include "content/renderer/media/crypto/renderer_cdm_manager.h" |
| #include "content/renderer/media/webcontentdecryptionmodule_impl.h" |
| #include "content/renderer/render_frame_impl.h" |
| @@ -1521,7 +1522,7 @@ WebMediaPlayerAndroid::GenerateKeyRequestInternal( |
| if (current_key_system_.empty()) { |
| if (!proxy_decryptor_) { |
| proxy_decryptor_.reset(new ProxyDecryptor( |
| - cdm_manager_, |
| + scoped_ptr<media::CdmFactory>(new RenderCdmFactory(cdm_manager_)), |
| base::Bind(&WebMediaPlayerAndroid::OnKeyAdded, |
| weak_factory_.GetWeakPtr()), |
| base::Bind(&WebMediaPlayerAndroid::OnKeyError, |