Refactor WebRtcVideoCapturer.

webrtc/media/base/testutils.h

Index: webrtc/media/base/testutils.h
diff --git a/webrtc/media/base/testutils.h b/webrtc/media/base/testutils.h
index 2e338d95ae4b1429f65b5ad2bdb98b96db9a1999..d69e10e6c0d57e8bd7599b36ec28574855ee23ac 100644
--- a/webrtc/media/base/testutils.h
+++ b/webrtc/media/base/testutils.h
@@ -114,28 +114,28 @@ class RtpTestUtility {
 };
 
 // Test helper for testing VideoCapturer implementations.
-class VideoCapturerListener : public sigslot::has_slots<> {
+class VideoCapturerListener
+    : public sigslot::has_slots<>,
+      public rtc::VideoSinkInterface<cricket::VideoFrame> {
  public:
   explicit VideoCapturerListener(VideoCapturer* cap);
+  ~VideoCapturerListener();
 
   CaptureState last_capture_state() const { return last_capture_state_; }
   int frame_count() const { return frame_count_; }
-  uint32_t frame_fourcc() const { return frame_fourcc_; }
   int frame_width() const { return frame_width_; }
   int frame_height() const { return frame_height_; }
-  uint32_t frame_size() const { return frame_size_; }
   bool resolution_changed() const { return resolution_changed_; }
 
   void OnStateChange(VideoCapturer* capturer, CaptureState state);
-  void OnFrameCaptured(VideoCapturer* capturer, const CapturedFrame* frame);
+  void OnFrame(const VideoFrame& frame) override;
 
  private:
+  VideoCapturer* capturer_;
   CaptureState last_capture_state_;
   int frame_count_;
-  uint32_t frame_fourcc_;
   int frame_width_;
   int frame_height_;
-  uint32_t frame_size_;
   bool resolution_changed_;
 };