Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1327)

Unified Diff: media/video/capture/video_capture_device_unittest.cc

Issue 25388002: Eliminates the use of VideoCaptureDevice1 in VideoCaptureDeviceLinux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 781c906f64535e5cf436e6c6f8e8be0b94082aa8..9f0f0da2a006b812de28c94e193e4d5478b9e79d 100644
--- a/media/video/capture/video_capture_device_unittest.cc
+++ b/media/video/capture/video_capture_device_unittest.cc
@@ -270,7 +270,7 @@ TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) {
// The device (if it is an async implementation) may or may not get as far
// as the OnFrameInfo() step; we're intentionally not going to wait for it
// to get that far.
- ON_CALL(*client, OnFrameInfo(_));
+ EXPECT_CALL(*client, OnFrameInfo(_)).Times(testing::AtMost(1));
device->AllocateAndStart(requested_format,
client.PassAs<Client>());
device->StopAndDeAllocate();

Powered by Google App Engine
This is Rietveld 408576698