Rename AdaptiveRendererFactory

media/base/renderer_factory_selector.cc

Index: media/base/renderer_factory_selector.cc
diff --git a/media/base/renderer_factory_selector.cc b/media/base/renderer_factory_selector.cc
index 3eb41fced272095dd0f017d5f20e22767959930b..fa309df7c817726a18833744aafeee40e041e9cf 100644
--- a/media/base/renderer_factory_selector.cc
+++ b/media/base/renderer_factory_selector.cc
@@ -26,20 +26,25 @@ void RendererFactorySelector::SetBaseFactoryType(FactoryType type) {
   current_factory_needs_update_ = true;
 }
 
-// For the moment, this method should only be called once or twice.
-// This method will be regularly called whenever the logic in choosing a
-// renderer type is moved out of the AdaptiveRendererFactory, into this method.
 void RendererFactorySelector::UpdateCurrentFactory() {
+  // We cannot use the MEDIA_PLAYER and the COURIER factory at the same time.
+  DCHECK(!use_media_player_ || !use_courier_cb_);
+
   DCHECK(base_factory_type_);
   FactoryType next_factory_type = base_factory_type_.value();
 
   if (use_media_player_)
     next_factory_type = FactoryType::MEDIA_PLAYER;
 
+  if (use_courier_cb_ && use_courier_cb_.Run())
+    next_factory_type = FactoryType::COURIER;
+
   DVLOG(1) << __func__ << " Selecting factory type: " << next_factory_type;
 
   current_factory_ = factories_[next_factory_type].get();
-  current_factory_needs_update_ = false;
+
+  // Update |current_factory_| every time if we are using the COURIER factory.
+  current_factory_needs_update_ = !!use_courier_cb_;
 }
 
 RendererFactory* RendererFactorySelector::GetCurrentFactory() {
@@ -57,4 +62,10 @@ void RendererFactorySelector::SetUseMediaPlayer(bool use_media_player) {
 }
 #endif
 
+void RendererFactorySelector::SetUseCourierCB(UseCourierCB use_courier_cb) {
+  DCHECK(!use_courier_cb_);
+  use_courier_cb_ = use_courier_cb;
+  current_factory_needs_update_ = true;
+}
+
 }  // namespace media