Move classses VideoCaptureDeviceClient and VideoCaptureBufferPool to media/capture/video

content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h

Index: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
diff --git a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
index 9367df232b6a9a3c52db25a354eec9029f4bce71..672735ebc4b2c46b891fc484d4338d3be2901788 100644
--- a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
+++ b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
@@ -18,7 +18,7 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
-#include "media/capture/video/video_capture_device.h"
+#include "media/capture/video/video_capture_jpeg_decoder.h"
 #include "media/video/jpeg_decode_accelerator.h"
 
 namespace gpu {
@@ -31,40 +31,6 @@ class VideoFrame;
 
 namespace content {
 
-class CONTENT_EXPORT VideoCaptureJpegDecoder {
- public:
-  // Enumeration of decoder status. The enumeration is published for clients to
-  // decide the behavior according to STATUS.
-  enum STATUS {
-    INIT_PENDING,  // Default value while waiting initialization finished.
-    INIT_PASSED,   // Initialization succeed.
-    FAILED,        // JPEG decode is not supported, initialization failed, or
-                   // decode error.
-  };
-
-  using DecodeDoneCB = base::Callback<void(
-      std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>,
-      const scoped_refptr<media::VideoFrame>&)>;
-
-  virtual ~VideoCaptureJpegDecoder() {}
-
-  // Creates and intializes decoder asynchronously.
-  virtual void Initialize() = 0;
-
-  // Returns initialization status.
-  virtual STATUS GetStatus() const = 0;
-
-  // Decodes a JPEG picture.
-  virtual void DecodeCapturedData(
-      const uint8_t* data,
-      size_t in_buffer_size,
-      const media::VideoCaptureFormat& frame_format,
-      base::TimeTicks reference_time,
-      base::TimeDelta timestamp,
-      std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>
-          out_buffer) = 0;
-};
-
 // Adapter to GpuJpegDecodeAccelerator for VideoCaptureDevice::Client. It takes
 // care of GpuJpegDecodeAccelerator creation, shared memory, and threading
 // issues.
@@ -73,7 +39,7 @@ class CONTENT_EXPORT VideoCaptureJpegDecoder {
 // on the same thread. JpegDecodeAccelerator::Client methods should be called on
 // the IO thread.
 class CONTENT_EXPORT VideoCaptureGpuJpegDecoder
-    : public VideoCaptureJpegDecoder,
+    : public media::VideoCaptureJpegDecoder,
       public media::JpegDecodeAccelerator::Client,
       public base::NonThreadSafe,
       public base::SupportsWeakPtr<VideoCaptureGpuJpegDecoder> {