Replace VideoCaptureDataCallback by VideoSinkInterface.

webrtc/media/engine/webrtcvideocapturer_unittest.cc

 /*
  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 57 matching lines @@
   EXPECT_EQ(kTestDeviceId, capturer_->GetId());
   EXPECT_TRUE(NULL != capturer_->GetSupportedFormats());
   ASSERT_EQ(1U, capturer_->GetSupportedFormats()->size());
   EXPECT_EQ(640, (*capturer_->GetSupportedFormats())[0].width);
   EXPECT_EQ(480, (*capturer_->GetSupportedFormats())[0].height);
   EXPECT_TRUE(capturer_->GetCaptureFormat() == NULL);  // not started yet
   EXPECT_FALSE(capturer_->IsRunning());
 }
 
 TEST_F(WebRtcVideoCapturerTest, TestInitVcm) {
-  EXPECT_TRUE(capturer_->Init(factory_->Create(0,
+  EXPECT_TRUE(capturer_->Init(factory_->Create(
       reinterpret_cast<const char*>(kTestDeviceId.c_str()))));
 }
 
 TEST_F(WebRtcVideoCapturerTest, TestCapture) {
   EXPECT_TRUE(capturer_->Init(cricket::Device(kTestDeviceName, kTestDeviceId)));
   cricket::VideoCapturerListener listener(capturer_.get());
   cricket::VideoFormat format(
       capturer_->GetSupportedFormats()->at(0));
   EXPECT_EQ(cricket::CS_STARTING, capturer_->Start(format));
   EXPECT_TRUE(capturer_->IsRunning());
   ASSERT_TRUE(capturer_->GetCaptureFormat() != NULL);
   EXPECT_EQ(format, *capturer_->GetCaptureFormat());
   EXPECT_EQ_WAIT(cricket::CS_RUNNING, listener.last_capture_state(), 1000);
   factory_->modules[0]->SendFrame(640, 480);
   EXPECT_TRUE_WAIT(listener.frame_count() > 0, 5000);
   EXPECT_EQ(640, listener.frame_width());
   EXPECT_EQ(480, listener.frame_height());
   EXPECT_EQ(cricket::CS_FAILED, capturer_->Start(format));
   capturer_->Stop();
   EXPECT_FALSE(capturer_->IsRunning());
   EXPECT_TRUE(capturer_->GetCaptureFormat() == NULL);
   EXPECT_EQ_WAIT(cricket::CS_STOPPED, listener.last_capture_state(), 1000);
 }
 
 TEST_F(WebRtcVideoCapturerTest, TestCaptureVcm) {
-  EXPECT_TRUE(capturer_->Init(factory_->Create(0,
+  EXPECT_TRUE(capturer_->Init(factory_->Create(
       reinterpret_cast<const char*>(kTestDeviceId.c_str()))));
   cricket::VideoCapturerListener listener(capturer_.get());
   EXPECT_TRUE(capturer_->GetSupportedFormats()->empty());
   VideoFormat format;
   EXPECT_TRUE(capturer_->GetBestCaptureFormat(kDefaultVideoFormat, &format));
   EXPECT_EQ(kDefaultVideoFormat.width, format.width);
   EXPECT_EQ(kDefaultVideoFormat.height, format.height);
   EXPECT_EQ(kDefaultVideoFormat.interval, format.interval);
   EXPECT_EQ(cricket::FOURCC_I420, format.fourcc);
   EXPECT_EQ(cricket::CS_STARTING, capturer_->Start(format));
@@ skipping 12 matching lines @@
 }
 
 TEST_F(WebRtcVideoCapturerTest, TestCaptureWithoutInit) {
   cricket::VideoFormat format;
   EXPECT_EQ(cricket::CS_FAILED, capturer_->Start(format));
   EXPECT_TRUE(capturer_->GetCaptureFormat() == NULL);
   EXPECT_FALSE(capturer_->IsRunning());
 }
 
 #endif  // HAVE_WEBRTC_VIDEO