Rename AdaptiveRendererFactory

media/base/renderer_factory_selector.h

Index: media/base/renderer_factory_selector.h
diff --git a/media/base/renderer_factory_selector.h b/media/base/renderer_factory_selector.h
index d40c20a32e3f9960feb0dfe9f801f1d5e4ec0f9a..6e4583b80f34aeb38d2dbbcada5b5554c73133c0 100644
--- a/media/base/renderer_factory_selector.h
+++ b/media/base/renderer_factory_selector.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_BASE_RENDERER_FACTORY_SELECTOR_H_
 #define MEDIA_BASE_RENDERER_FACTORY_SELECTOR_H_
 
+#include "base/callback.h"
 #include "base/optional.h"
 #include "media/base/renderer_factory.h"
 
@@ -15,12 +16,14 @@ namespace media {
 // choosing which RendererFactory should be used when creating a new Renderer.
 class MEDIA_EXPORT RendererFactorySelector {
  public:
+  using UseCourierCB = base::Callback<bool()>;
+
   enum FactoryType {
     DEFAULT,       // DefaultRendererFactory.
     MOJO,          // MojoRendererFactory.
     MEDIA_PLAYER,  // MediaPlayerRendererClientFactory.
-    ADAPTIVE,      // AdaptiveRendererFactory.
-    FACTORY_TYPE_MAX = ADAPTIVE,
+    COURIER,       // CourierRendererFactory.
+    FACTORY_TYPE_MAX = COURIER,
   };
 
   RendererFactorySelector();
@@ -46,11 +49,17 @@ class MEDIA_EXPORT RendererFactorySelector {
   void SetUseMediaPlayer(bool use_media_player);
 #endif
 
+  // Sets the callback to check whether we should be temporarily use the COURIER
+  // factory.
+  void SetUseCourierCB(UseCourierCB use_courier_cb);
+
  private:
   void UpdateCurrentFactory();
 
   bool use_media_player_ = false;
 
+  UseCourierCB use_courier_cb_;

[miu, 2017/05/02 22:40:04]

nit: When I see this used in the code, it feels like this member is a bool, but
we know it's not. Up to you, but consider changing the name. I myself can't come
up with any great ones though. Maybe: query_to_use_courier_cb_ or
remoting_is_active_cb_ or some such?

[tguilbert, 2017/05/03 01:34:25]

I am using QueryIsRemotingActiveCB for now. I also considered
QueryHasRemotingStartedCB. LMK if you have any other ideas/preferences.

+
   bool current_factory_needs_update_ = true;

[miu, 2017/05/02 22:40:04]

Can we simplify by getting rid of |current_factory_| and
|current_factory_needs_update_|? Meaning, just have GetCurrentFactory()
determine which pointer to return each time it's called. Unless I'm mistaken,
GetCurrentFactory() isn't being called so frequently that we need this pointer
caching mechanism.

[tguilbert, 2017/05/03 01:34:25]

You are right, this was probably excessive in the first place. Done.

   RendererFactory* current_factory_ = nullptr;