| Index: media/mojo/services/service_factory_impl.cc
|
| diff --git a/media/mojo/services/service_factory_impl.cc b/media/mojo/services/service_factory_impl.cc
|
| index fcbbc61432407a8cf9b9521603bd3a5fc5981b13..eb59c8f0144b16a7b7f59764faffb6fc34d88a0d 100644
|
| --- a/media/mojo/services/service_factory_impl.cc
|
| +++ b/media/mojo/services/service_factory_impl.cc
|
| @@ -12,6 +12,7 @@
|
| #include "media/mojo/services/mojo_media_client.h"
|
| #include "media/mojo/services/mojo_renderer_service.h"
|
| #include "mojo/application/public/cpp/app_lifetime_helper.h"
|
| +#include "mojo/application/public/interfaces/service_provider.mojom.h"
|
|
|
| namespace media {
|
|
|
| @@ -20,10 +21,10 @@ ServiceFactoryImpl::ServiceFactoryImpl(
|
| mojo::ServiceProvider* service_provider,
|
| scoped_refptr<MediaLog> media_log,
|
| scoped_ptr<mojo::AppRefCount> parent_app_refcount)
|
| - : binding_(this, request.Pass()),
|
| + : binding_(this, std::move(request)),
|
| service_provider_(service_provider),
|
| media_log_(media_log),
|
| - parent_app_refcount_(parent_app_refcount.Pass()) {
|
| + parent_app_refcount_(std::move(parent_app_refcount)) {
|
| DVLOG(1) << __FUNCTION__;
|
| }
|
|
|
| @@ -36,14 +37,14 @@ void ServiceFactoryImpl::CreateRenderer(
|
| mojo::InterfaceRequest<interfaces::Renderer> request) {
|
| // The created object is owned by the pipe.
|
| new MojoRendererService(cdm_service_context_.GetWeakPtr(),
|
| - GetRendererFactory(), media_log_, request.Pass());
|
| + GetRendererFactory(), media_log_, std::move(request));
|
| }
|
|
|
| void ServiceFactoryImpl::CreateCdm(
|
| mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request) {
|
| // The created object is owned by the pipe.
|
| new MojoCdmService(cdm_service_context_.GetWeakPtr(), service_provider_,
|
| - GetCdmFactory(), request.Pass());
|
| + GetCdmFactory(), std::move(request));
|
| }
|
|
|
| RendererFactory* ServiceFactoryImpl::GetRendererFactory() {
|
| @@ -55,7 +56,7 @@ RendererFactory* ServiceFactoryImpl::GetRendererFactory() {
|
|
|
| CdmFactory* ServiceFactoryImpl::GetCdmFactory() {
|
| if (!cdm_factory_)
|
| - cdm_factory_ = MojoMediaClient::Get()->CreateCdmFactory();
|
| + cdm_factory_ = MojoMediaClient::Get()->CreateCdmFactory(service_provider_);
|
| return cdm_factory_.get();
|
| }
|
|
|
|
|