| 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 dea7c9226f000aeee6fdb960b90c518a2c13697a..d046f0d7cf3e99893c36ec52159a3ac784e2035c 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"
|
| @@ -54,7 +55,7 @@ void MojoMediaApplication::Create(
|
| mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) {
|
| // The created object is owned by the pipe.
|
| new MojoCdmService(&cdm_service_context_, connection->GetServiceProvider(),
|
| - request.Pass());
|
| + GetCdmFactory(), request.Pass());
|
| }
|
|
|
| void MojoMediaApplication::Create(
|
| @@ -71,4 +72,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
|
|
|