Merge 217276 "Add media::VideoEncodeAccelerator with WebRTC inte..."

content/renderer/media/webmediaplayer_params.h

Index: content/renderer/media/webmediaplayer_params.h
===================================================================
--- content/renderer/media/webmediaplayer_params.h	(revision 217687)
+++ content/renderer/media/webmediaplayer_params.h	(working copy)
@@ -14,7 +14,7 @@
 
 namespace media {
 class AudioRendererSink;
-class GpuVideoDecoderFactories;
+class GpuVideoAcceleratorFactories;
 class MediaLog;
 }
 
@@ -30,7 +30,7 @@
       const scoped_refptr<base::MessageLoopProxy>& message_loop_proxy,
       const base::Callback<void(const base::Closure&)>& defer_load_cb,
       const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink,
-      const scoped_refptr<media::GpuVideoDecoderFactories>& gpu_factories,
+      const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories,
       const scoped_refptr<media::MediaLog>& media_log);
   ~WebMediaPlayerParams();
 
@@ -46,7 +46,8 @@
     return audio_renderer_sink_;
   }
 
-  const scoped_refptr<media::GpuVideoDecoderFactories>& gpu_factories() const {
+  const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories()
+      const {
     return gpu_factories_;
   }
 
@@ -58,7 +59,7 @@
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
   base::Callback<void(const base::Closure&)> defer_load_cb_;
   scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
-  scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories_;
+  scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_;
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);