| Index: content/renderer/media/media_interface_provider.cc
|
| diff --git a/content/renderer/media/media_interface_provider.cc b/content/renderer/media/media_interface_provider.cc
|
| index 239111224ad88445e94d295789170ccee11989b4..84faca9bb32ac79928489d0f8b6b00f95f3d4aae 100644
|
| --- a/content/renderer/media/media_interface_provider.cc
|
| +++ b/content/renderer/media/media_interface_provider.cc
|
| @@ -27,23 +27,22 @@ void MediaInterfaceProvider::GetInterface(const mojo::String& interface_name,
|
| DVLOG(1) << __FUNCTION__;
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| - if (interface_name == media::interfaces::ContentDecryptionModule::Name_) {
|
| + if (interface_name == media::mojom::ContentDecryptionModule::Name_) {
|
| GetMediaServiceFactory()->CreateCdm(
|
| - mojo::MakeRequest<media::interfaces::ContentDecryptionModule>(
|
| + mojo::MakeRequest<media::mojom::ContentDecryptionModule>(
|
| std::move(pipe)));
|
| - } else if (interface_name == media::interfaces::Renderer::Name_) {
|
| + } else if (interface_name == media::mojom::Renderer::Name_) {
|
| GetMediaServiceFactory()->CreateRenderer(
|
| - mojo::MakeRequest<media::interfaces::Renderer>(std::move(pipe)));
|
| - } else if (interface_name == media::interfaces::AudioDecoder::Name_) {
|
| + mojo::MakeRequest<media::mojom::Renderer>(std::move(pipe)));
|
| + } else if (interface_name == media::mojom::AudioDecoder::Name_) {
|
| GetMediaServiceFactory()->CreateAudioDecoder(
|
| - mojo::MakeRequest<media::interfaces::AudioDecoder>(std::move(pipe)));
|
| + mojo::MakeRequest<media::mojom::AudioDecoder>(std::move(pipe)));
|
| } else {
|
| NOTREACHED();
|
| }
|
| }
|
|
|
| -media::interfaces::ServiceFactory*
|
| -MediaInterfaceProvider::GetMediaServiceFactory() {
|
| +media::mojom::ServiceFactory* MediaInterfaceProvider::GetMediaServiceFactory() {
|
| DVLOG(1) << __FUNCTION__;
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
|
|