Refactor WebRtcVideoCapturer.

webrtc/media/base/testutils.cc

Index: webrtc/media/base/testutils.cc
diff --git a/webrtc/media/base/testutils.cc b/webrtc/media/base/testutils.cc
index 9e2d174f61b6508dcea0d0b1ce051a3c327f6956..321719d3e9df175a61a1c1891be6363ff1243543 100644
--- a/webrtc/media/base/testutils.cc
+++ b/webrtc/media/base/testutils.cc
@@ -210,17 +210,19 @@ bool RtpTestUtility::VerifyPacket(const RtpDumpPacket* dump,
 
 // Implementation of VideoCaptureListener.
 VideoCapturerListener::VideoCapturerListener(VideoCapturer* capturer)
-    : last_capture_state_(CS_STARTING),
+    : capturer_(capturer),
+      last_capture_state_(CS_STARTING),
       frame_count_(0),
-      frame_fourcc_(0),
       frame_width_(0),
       frame_height_(0),
-      frame_size_(0),
       resolution_changed_(false) {
   capturer->SignalStateChange.connect(this,
       &VideoCapturerListener::OnStateChange);
-  capturer->SignalFrameCaptured.connect(this,
-      &VideoCapturerListener::OnFrameCaptured);
+  capturer->AddOrUpdateSink(this, rtc::VideoSinkWants());
+}
+
+VideoCapturerListener::~VideoCapturerListener() {
+  capturer_->RemoveSink(this);
 }
 
 void VideoCapturerListener::OnStateChange(VideoCapturer* capturer,
@@ -228,15 +230,12 @@ void VideoCapturerListener::OnStateChange(VideoCapturer* capturer,
   last_capture_state_ = result;
 }
 
-void VideoCapturerListener::OnFrameCaptured(VideoCapturer* capturer,
-                                            const CapturedFrame* frame) {
+void VideoCapturerListener::OnFrame(const VideoFrame& frame) {
   ++frame_count_;
   if (1 == frame_count_) {
-    frame_fourcc_ = frame->fourcc;
-    frame_width_ = frame->width;
-    frame_height_ = frame->height;
-    frame_size_ = frame->data_size;
-  } else if (frame_width_ != frame->width || frame_height_ != frame->height) {
+    frame_width_ = frame.width();
+    frame_height_ = frame.height();
+  } else if (frame_width_ != frame.width() || frame_height_ != frame.height()) {
     resolution_changed_ = true;
   }
 }