Rename AdaptiveRendererFactory

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 266 matching lines @@
 #if !defined(ENABLE_MOJO_RENDERER) || \
     BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
 #include "media/renderers/default_renderer_factory.h"  // nogncheck
 #endif
 
 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
 #include "media/mojo/clients/mojo_decoder_factory.h"  // nogncheck
 #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
 #include "media/remoting/shared_session.h"                // nogncheck
 #include "media/remoting/sink_availability_observer.h"    // nogncheck
 #endif
 
 using base::Time;
 using base::TimeDelta;
 using blink::WebCachePolicy;
@@ skipping 2651 matching lines @@
 #else
   media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>(
       media_log.get(), GetDecoderFactory(),
       base::Bind(&RenderThreadImpl::GetGpuFactories,
                  base::Unretained(render_thread)));
 
   factory_type = media::RendererFactorySelector::FactoryType::DEFAULT;
 #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_)
     url_index_.reset(new media::UrlIndex(frame_));
 
   factory_selector->AddFactory(factory_type, std::move(media_renderer_factory));
   factory_selector->SetBaseFactoryType(factory_type);
 
   std::unique_ptr<media::WebMediaPlayerParams> params(
       new media::WebMediaPlayerParams(
@@ skipping 4094 matching lines @@
       policy(info.default_policy),
       replaces_current_history_item(info.replaces_current_history_item),
       history_navigation_in_new_child_frame(
           info.is_history_navigation_in_new_child_frame),
       client_redirect(info.is_client_redirect),
       cache_disabled(info.is_cache_disabled),
       form(info.form),
       source_location(info.source_location) {}
 
 }  // namespace content