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 e07e9705def101013907379d0de5d9309d6f2f12..6d846aeb5d6f433ca50e1db37824f3fbbf7ac358 100644 |
--- a/media/video/capture/video_capture_device_unittest.cc |
+++ b/media/video/capture/video_capture_device_unittest.cc |
@@ -232,7 +232,6 @@ TEST_F(VideoCaptureDeviceTest, OpenInvalidDevice) { |
capture_params.requested_format.frame_size.SetSize(640, 480); |
capture_params.requested_format.frame_rate = 30; |
capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420; |
- capture_params.allow_resolution_change = false; |
device->AllocateAndStart(capture_params, client_.PassAs<Client>()); |
device->StopAndDeAllocate(); |
} |
@@ -258,7 +257,6 @@ TEST_F(VideoCaptureDeviceTest, CaptureVGA) { |
capture_params.requested_format.frame_size.SetSize(640, 480); |
capture_params.requested_format.frame_rate = 30; |
capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420; |
- capture_params.allow_resolution_change = false; |
device->AllocateAndStart(capture_params, client_.PassAs<Client>()); |
// Get captured video frames. |
WaitForCapturedFrame(); |
@@ -285,7 +283,6 @@ TEST_F(VideoCaptureDeviceTest, Capture720p) { |
capture_params.requested_format.frame_size.SetSize(1280, 720); |
capture_params.requested_format.frame_rate = 30; |
capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420; |
- capture_params.allow_resolution_change = false; |
device->AllocateAndStart(capture_params, client_.PassAs<Client>()); |
// Get captured video frames. |
WaitForCapturedFrame(); |
@@ -309,7 +306,6 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) { |
capture_params.requested_format.frame_size.SetSize(637, 472); |
capture_params.requested_format.frame_rate = 35; |
capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420; |
- capture_params.allow_resolution_change = false; |
device->AllocateAndStart(capture_params, client_.PassAs<Client>()); |
WaitForCapturedFrame(); |
device->StopAndDeAllocate(); |
@@ -339,7 +335,6 @@ TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) { |
capture_params.requested_format.frame_size = resolution; |
capture_params.requested_format.frame_rate = 30; |
capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420; |
- capture_params.allow_resolution_change = false; |
device->AllocateAndStart(capture_params, client_.PassAs<Client>()); |
device->StopAndDeAllocate(); |
} |
@@ -349,7 +344,6 @@ TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) { |
capture_params.requested_format.frame_size.SetSize(320, 240); |
capture_params.requested_format.frame_rate = 30; |
capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420; |
- capture_params.allow_resolution_change = false; |
ResetWithNewClient(); |
scoped_ptr<VideoCaptureDevice> device( |
@@ -380,7 +374,6 @@ TEST_F(VideoCaptureDeviceTest, DeAllocateCameraWhileRunning) { |
capture_params.requested_format.frame_size.SetSize(640, 480); |
capture_params.requested_format.frame_rate = 30; |
capture_params.requested_format.pixel_format = PIXEL_FORMAT_I420; |
- capture_params.allow_resolution_change = false; |
device->AllocateAndStart(capture_params, client_.PassAs<Client>()); |
// Get captured video frames. |
WaitForCapturedFrame(); |
@@ -409,7 +402,6 @@ TEST_F(VideoCaptureDeviceTest, MAYBE_CaptureMjpeg) { |
capture_params.requested_format.frame_size.SetSize(1280, 720); |
capture_params.requested_format.frame_rate = 30; |
capture_params.requested_format.pixel_format = PIXEL_FORMAT_MJPEG; |
- capture_params.allow_resolution_change = false; |
device->AllocateAndStart(capture_params, client_.PassAs<Client>()); |
// Get captured video frames. |
WaitForCapturedFrame(); |