| Index: media/mojo/services/mojo_media_application.cc
|
| diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
|
| index 6ecb0896ce6f851304b85a43117fd2dc3b78d3a8..ff10d99250cc2f21df276c7ae180d28845672f30 100644
|
| --- a/media/mojo/services/mojo_media_application.cc
|
| +++ b/media/mojo/services/mojo_media_application.cc
|
| @@ -5,6 +5,7 @@
|
| #include "media/mojo/services/mojo_media_application.h"
|
|
|
| #include "base/logging.h"
|
| +#include "media/base/cdm_factory.h"
|
| #include "media/base/media_log.h"
|
| #include "media/base/renderer_factory.h"
|
| #include "media/mojo/services/mojo_cdm_service.h"
|
| @@ -53,7 +54,7 @@ void MojoMediaApplication::Create(
|
| mojo::ApplicationConnection* connection,
|
| mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) {
|
| // The created object is owned by the pipe.
|
| - new MojoCdmService(&cdm_service_context_, request.Pass());
|
| + new MojoCdmService(&cdm_service_context_, GetCdmFactory(), request.Pass());
|
| }
|
|
|
| void MojoMediaApplication::Create(
|
| @@ -70,4 +71,10 @@ RendererFactory* MojoMediaApplication::GetRendererFactory() {
|
| return renderer_factory_.get();
|
| }
|
|
|
| +CdmFactory* MojoMediaApplication::GetCdmFactory() {
|
| + if (!cdm_factory_)
|
| + cdm_factory_ = MojoMediaClient::Get()->GetCdmFactory();
|
| + return cdm_factory_.get();
|
| +}
|
| +
|
| } // namespace media
|
|
|