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

content/renderer/media/rtc_video_decoder.h

Index: content/renderer/media/rtc_video_decoder.h
===================================================================
--- content/renderer/media/rtc_video_decoder.h	(revision 217687)
+++ content/renderer/media/rtc_video_decoder.h	(working copy)
@@ -30,7 +30,7 @@
 
 namespace media {
 class DecoderBuffer;
-class GpuVideoDecoderFactories;
+class GpuVideoAcceleratorFactories;
 }
 
 namespace content {
@@ -52,7 +52,7 @@
   // run on the message loop of |factories|.
   static scoped_ptr<RTCVideoDecoder> Create(
       webrtc::VideoCodecType type,
-      const scoped_refptr<media::GpuVideoDecoderFactories>& factories);
+      const scoped_refptr<media::GpuVideoAcceleratorFactories>& factories);
 
   // webrtc::VideoDecoder implementation.
   // Called on WebRTC DecodingThread.
@@ -113,7 +113,7 @@
 
   // The meessage loop of |factories| will be saved to |vda_loop_proxy_|.
   RTCVideoDecoder(
-      const scoped_refptr<media::GpuVideoDecoderFactories>& factories);
+      const scoped_refptr<media::GpuVideoAcceleratorFactories>& factories);
 
   void Initialize(base::WaitableEvent* waiter);
 
@@ -197,7 +197,7 @@
   base::WeakPtrFactory<RTCVideoDecoder> weak_factory_;
   base::WeakPtr<RTCVideoDecoder> weak_this_;
 
-  scoped_refptr<media::GpuVideoDecoderFactories> factories_;
+  scoped_refptr<media::GpuVideoAcceleratorFactories> factories_;
 
   // The message loop to run callbacks on. This is from |factories_|.
   scoped_refptr<base::MessageLoopProxy> vda_loop_proxy_;