Request a GpuVideoAcceleratorFactories when constructing decoders.

media/renderers/default_renderer_factory.h

Index: media/renderers/default_renderer_factory.h
diff --git a/media/renderers/default_renderer_factory.h b/media/renderers/default_renderer_factory.h
index 44123169817cb2bf0ca8f7c73f7cb345914ca672..8529400583b953953c298bba70c6cf0eae66b2d9 100644
--- a/media/renderers/default_renderer_factory.h
+++ b/media/renderers/default_renderer_factory.h
@@ -25,10 +25,11 @@ class VideoRendererSink;
 // The default factory class for creating RendererImpl.
 class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory {
  public:
-  DefaultRendererFactory(const scoped_refptr<MediaLog>& media_log,
-                         DecoderFactory* decoder_factory,
-                         GpuVideoAcceleratorFactories* gpu_factories,
-                         const AudioHardwareConfig& audio_hardware_config);
+  DefaultRendererFactory(
+      const scoped_refptr<MediaLog>& media_log,
+      DecoderFactory* decoder_factory,
+      base::Callback<GpuVideoAcceleratorFactories*()> get_gpu_factories_cb,

[DaleCurtis, 2016/03/11 23:46:20]

const&?

[sandersd (OOO until July 31), 2016/03/11 23:56:22]

Done.

+      const AudioHardwareConfig& audio_hardware_config);
   ~DefaultRendererFactory() final;
 
   scoped_ptr<Renderer> CreateRenderer(
@@ -43,7 +44,8 @@ class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory {
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner);
   ScopedVector<VideoDecoder> CreateVideoDecoders(
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
-      const RequestSurfaceCB& request_surface_cb);
+      const RequestSurfaceCB& request_surface_cb,
+      GpuVideoAcceleratorFactories* gpu_factories);
 
   scoped_refptr<MediaLog> media_log_;
 
@@ -52,7 +54,7 @@ class MEDIA_EXPORT DefaultRendererFactory : public RendererFactory {
   DecoderFactory* decoder_factory_;
 
   // Factories for supporting video accelerators. May be null.
-  GpuVideoAcceleratorFactories* gpu_factories_;
+  base::Callback<GpuVideoAcceleratorFactories*()> get_gpu_factories_cb_;

[DaleCurtis, 2016/03/11 23:46:20]

Create typedef/using entry for the callback type.

[sandersd (OOO until July 31), 2016/03/11 23:56:22]

Done.

 
   const AudioHardwareConfig& audio_hardware_config_;