| Index: media/mojo/services/mojo_media_client.cc
|
| diff --git a/media/mojo/services/mojo_media_client.cc b/media/mojo/services/mojo_media_client.cc
|
| index d59214f43f3ba69ad24f844de8c63dfe7c6ff8d1..7501b5dc884a89aefb3acb7adeef1f3047144b74 100644
|
| --- a/media/mojo/services/mojo_media_client.cc
|
| +++ b/media/mojo/services/mojo_media_client.cc
|
| @@ -41,8 +41,7 @@
|
| return nullptr;
|
| }
|
|
|
| -scoped_ptr<CdmFactory> PlatformMojoMediaClient::CreateCdmFactory(
|
| - mojo::ServiceProvider* service_provider) {
|
| +scoped_ptr<CdmFactory> PlatformMojoMediaClient::CreateCdmFactory() {
|
| return nullptr;
|
| }
|
|
|
| @@ -88,13 +87,12 @@
|
| return mojo_media_client_->GetAudioHardwareConfig();
|
| }
|
|
|
| -scoped_ptr<CdmFactory> MojoMediaClient::CreateCdmFactory(
|
| - mojo::ServiceProvider* service_provider) {
|
| - return mojo_media_client_->CreateCdmFactory(service_provider);
|
| +scoped_ptr<CdmFactory> MojoMediaClient::CreateCdmFactory() {
|
| + return mojo_media_client_->CreateCdmFactory();
|
| }
|
|
|
| MojoMediaClient::MojoMediaClient()
|
| - : mojo_media_client_(internal::CreatePlatformMojoMediaClient()) {
|
| + : mojo_media_client_(internal::CreatePlatformMojoMediaClient().Pass()) {
|
| DCHECK(mojo_media_client_);
|
| }
|
|
|
|
|