Rename AdaptiveRendererFactory

media/base/renderer_factory_selector.h

 // Copyright 2017 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.
 
 #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"
 
 namespace media {
 
 // RendererFactorySelector owns RendererFactory instances used within WMPI.
 // Its purpose is to aggregate the signals and centralize the logic behind
 // 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();
   ~RendererFactorySelector();
 
   // NOTE: There should be at most one factory per factory type.
   void AddFactory(FactoryType type, std::unique_ptr<RendererFactory> factory);
 
   // Sets the base factory to be returned, when there are no signals telling us
   // to select any specific factory.
   // NOTE: |type| can be different than FactoryType::DEFAULT. DEFAULT is used to
   // identify the DefaultRendererFactory, not to indicate that a factory should
   // be used by default.
   void SetBaseFactoryType(FactoryType type);
 
   // Updates |current_factory_| if necessary, and returns its value.
   // NOTE: SetBaseFactoryType() must be called before calling this method.
   RendererFactory* GetCurrentFactory();
 
 #if defined(OS_ANDROID)
   // Sets whether we should be using the MEDIA_PLAYER factory instead of the
   // base factory.
   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;
 
   base::Optional<FactoryType> base_factory_type_;
   std::unique_ptr<RendererFactory> factories_[FACTORY_TYPE_MAX + 1];
   DISALLOW_COPY_AND_ASSIGN(RendererFactorySelector);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_RENDERER_FACTORY_H_