 Chromium Code Reviews
 Chromium Code Reviews Issue 1231623003:
  media: Support CdmFactory in MojoMediaClient.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1231623003:
  media: Support CdmFactory in MojoMediaClient.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: media/mojo/services/default_mojo_media_client.cc | 
| diff --git a/media/mojo/services/default_mojo_media_client.cc b/media/mojo/services/default_mojo_media_client.cc | 
| index 37448ba6c1dc5a9ed66d91499b70b9d8b9cbff97..5d19401bd62f90dbc954f664e59419b1708db719 100644 | 
| --- a/media/mojo/services/default_mojo_media_client.cc | 
| +++ b/media/mojo/services/default_mojo_media_client.cc | 
| @@ -10,6 +10,7 @@ | 
| #include "media/audio/fake_audio_log_factory.h" | 
| #include "media/base/media.h" | 
| #include "media/base/null_video_sink.h" | 
| +#include "media/cdm/default_cdm_factory.h" | 
| #include "media/renderers/default_renderer_factory.h" | 
| #include "media/renderers/gpu_video_accelerator_factories.h" | 
| @@ -72,6 +73,10 @@ class DefaultMojoMediaClient : public PlatformMojoMediaClient { | 
| return *audio_hardware_config_; | 
| } | 
| + scoped_ptr<CdmFactory> GetCdmFactory() override { | 
| + return make_scoped_ptr(new DefaultCdmFactory()); | 
| 
ddorwin
2015/07/09 18:13:03
It seems odd that this creates a new object each t
 
xhwang
2015/07/09 21:16:31
This makes sense. But then most other methods need
 
ddorwin
2015/07/09 21:19:20
Yes.
 | 
| + } | 
| + | 
| private: | 
| FakeAudioLogFactory fake_audio_log_factory_; | 
| scoped_ptr<AudioHardwareConfig> audio_hardware_config_; |