Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 59ec80196bf01c7bdc3b04b89ee25c51df53f072..43059a4887a9488fb003f26acd034ec38a82c3bf 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -284,7 +284,7 @@ |
#endif |
#if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
-#include "media/remoting/adaptive_renderer_factory.h" // nogncheck |
+#include "media/remoting/courier_renderer_factory.h" // nogncheck |
#include "media/remoting/remoting_cdm_controller.h" // nogncheck |
#include "media/remoting/remoting_cdm_factory.h" // nogncheck |
#include "media/remoting/renderer_controller.h" // nogncheck |
@@ -2956,11 +2956,19 @@ blink::WebMediaPlayer* RenderFrameImpl::CreateMediaPlayer( |
#endif // defined(ENABLE_MOJO_RENDERER) |
#if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
- media_renderer_factory = |
- base::MakeUnique<media::remoting::AdaptiveRendererFactory>( |
- std::move(media_renderer_factory), std::move(remoting_controller)); |
+ auto courier_factory = |
+ base::MakeUnique<media::remoting::CourierRendererFactory>( |
+ std::move(remoting_controller)); |
- factory_type = media::RendererFactorySelector::FactoryType::ADAPTIVE; |
+ // base::Unretained is safe here because |factory_selector| owns |
+ // |courier_factory|. |
+ factory_selector->SetQueryIsRemotingActiveCB( |
+ base::Bind(&media::remoting::CourierRendererFactory::IsRemotingActive, |
+ base::Unretained(courier_factory.get()))); |
+ |
+ factory_selector->AddFactory( |
+ media::RendererFactorySelector::FactoryType::COURIER, |
+ std::move(courier_factory)); |
#endif |
if (!url_index_.get() || url_index_->frame() != frame_) |