| Index: media/video/capture/video_capture_device_unittest.cc
|
| diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
|
| index 061e6f0134f8e8ca5b6c38f7034b0348cc816186..0c66c344fea14cea9b81874692fd079a88356c18 100644
|
| --- a/media/video/capture/video_capture_device_unittest.cc
|
| +++ b/media/video/capture/video_capture_device_unittest.cc
|
| @@ -67,16 +67,6 @@
|
| MOCK_METHOD2(ReserveOutputBuffer,
|
| scoped_refptr<Buffer>(VideoFrame::Format format,
|
| const gfx::Size& dimensions));
|
| - MOCK_METHOD9(OnIncomingCapturedYuvData,
|
| - void (const uint8* y_data,
|
| - const uint8* u_data,
|
| - const uint8* v_data,
|
| - size_t y_stride,
|
| - size_t u_stride,
|
| - size_t v_stride,
|
| - const VideoCaptureFormat& frame_format,
|
| - int clockwise_rotation,
|
| - const base::TimeTicks& timestamp));
|
| MOCK_METHOD3(OnIncomingCapturedVideoFrame,
|
| void(const scoped_refptr<Buffer>& buffer,
|
| const scoped_refptr<VideoFrame>& frame,
|
| @@ -137,8 +127,6 @@
|
| VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice(
|
| base::android::AttachCurrentThread());
|
| #endif
|
| - EXPECT_CALL(*client_, OnIncomingCapturedYuvData(_,_,_,_,_,_,_,_,_))
|
| - .Times(0);
|
| EXPECT_CALL(*client_, ReserveOutputBuffer(_,_)).Times(0);
|
| EXPECT_CALL(*client_, OnIncomingCapturedVideoFrame(_,_,_)).Times(0);
|
| }
|
| @@ -191,8 +179,7 @@
|
| }
|
| }
|
| }
|
| - DVLOG_IF(1, pixel_format != PIXEL_FORMAT_MAX) << "No camera can capture the"
|
| - << " format: " << VideoCaptureFormat::PixelFormatToString(pixel_format);
|
| + DVLOG(1) << "No camera can capture the format: " << pixel_format;
|
| return scoped_ptr<VideoCaptureDevice::Name>();
|
| }
|
|
|
|
|