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

content/common/gpu/client/gpu_channel_host.h

Index: content/common/gpu/client/gpu_channel_host.h
===================================================================
--- content/common/gpu/client/gpu_channel_host.h	(revision 217687)
+++ content/common/gpu/client/gpu_channel_host.h	(working copy)
@@ -23,6 +23,7 @@
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_sync_channel.h"
 #include "media/video/video_decode_accelerator.h"
+#include "media/video/video_encode_accelerator.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gpu_preference.h"
@@ -128,6 +129,10 @@
       media::VideoCodecProfile profile,
       media::VideoDecodeAccelerator::Client* client);
 
+  // Creates a video encoder in the GPU process.
+  scoped_ptr<media::VideoEncodeAccelerator> CreateVideoEncoder(
+      media::VideoEncodeAccelerator::Client* client);
+
   // Destroy a command buffer created by this channel.
   void DestroyCommandBuffer(CommandBufferProxyImpl* command_buffer);