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

> Add media::VideoEncodeAccelerator with WebRTC integration
> 
> * Adds media::VideoEncodeAccelerator class.
> * Add GpuVideoEncodeAccelerator{,Host} classes and appropriate IPC.
> * Integrates into WebRTC stack with RTCVideoEncoderFactory/RTCVideoEncoder.
> * Rename media::GpuVideoDecodeFactories -> media::GpuVideoAcceleratorFactories
>   and generalize for use by the encode accelerator implementations as well.
> 
> BUG=260210
> BUG=170345
> TEST=local build, run on CrOS snow; local build, unittests on desktop Linux
> 
> Review URL: https://chromiumcodereview.appspot.com/20632002

TBR=sheu@chromium.org

Review URL: https://codereview.chromium.org/22875014

git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@217691 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index 23b1ddf52..c386b08 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -56,7 +56,7 @@ class MessageLoopProxy;
 namespace media {
 class ChunkDemuxer;
 class FFmpegDemuxer;
-class GpuVideoDecoderFactories;
+class GpuVideoAcceleratorFactories;
 class MediaLog;
 }
 
@@ -318,8 +318,8 @@ class WebMediaPlayerImpl
 
   bool incremented_externally_allocated_memory_;
 
-  // Factories for supporting GpuVideoDecoder. May be null.
-  scoped_refptr<media::GpuVideoDecoderFactories> gpu_factories_;
+  // Factories for supporting video accelerators. May be null.
+  scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_;
 
   // Routes audio playback to either AudioRendererSink or WebAudio.
   scoped_refptr<WebAudioSourceProviderImpl> audio_source_provider_;