Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 95f902498b71abf6d9b847b6cafb79732fe487a0..8ebe9c3146d13de1741aeb12cdb707d9b29c8d61 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -235,7 +235,7 @@ |
#include "media/renderers/default_renderer_factory.h" |
#endif |
-#if defined(ENABLE_MOJO_AUDIO_DECODER) |
+#if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) |
#include "media/mojo/services/mojo_decoder_factory.h" // nogncheck |
#endif |
@@ -6002,10 +6002,10 @@ media::CdmFactory* RenderFrameImpl::GetCdmFactory() { |
} |
media::DecoderFactory* RenderFrameImpl::GetDecoderFactory() { |
-#if defined(ENABLE_MOJO_AUDIO_DECODER) |
+#if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) |
if (!decoder_factory_) { |
decoder_factory_.reset( |
- new media::MojoDecoderFactory(GetMediaServiceFactory())); |
+ new media::MojoDecoderFactory(GetMediaInterfaceProvider())); |
} |
#endif |
return decoder_factory_.get(); |