From a420f12c72195557b282f47d0cb7eb4684c79f35 Mon Sep 17 00:00:00 2001 From: Kuo Jen Wei Date: Mon, 7 Sep 2020 02:53:13 +0000 Subject: [PATCH] Enable UsingRealWebcam_* test on ChromeOS Bug: 1069608 Test: Pass 'tast --verbose run "camera.CaptureUnittests"' 15 times in a row. Change-Id: I30d6872ad9a6d30a41cc14648a12d71a1fed274a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2387911 Commit-Queue: Inker Kuo Auto-Submit: Inker Kuo Reviewed-by: Shik Chen Reviewed-by: Guido Urdaneta Cr-Commit-Position: refs/heads/master@{#804650} --- media/capture/video/video_capture_device_unittest.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc index a878a5530ccd46..c17cb4fcb35d58 100644 --- a/media/capture/video/video_capture_device_unittest.cc +++ b/media/capture/video/video_capture_device_unittest.cc @@ -97,13 +97,9 @@ #define MAYBE_UsingRealWebcam_AllocateBadSize \ DISABLED_UsingRealWebcam_AllocateBadSize #define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg -// Flaky: https://crbug.com/1096082 -#define MAYBE_UsingRealWebcam_TakePhoto DISABLED_UsingRealWebcam_TakePhoto -#define MAYBE_UsingRealWebcam_GetPhotoState \ - DISABLED_UsingRealWebcam_GetPhotoState -// Flaky crash: https://crbug.com/1069608 -#define MAYBE_UsingRealWebcam_CaptureWithSize \ - DISABLED_UsingRealWebcam_CaptureWithSize +#define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto +#define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState +#define MAYBE_UsingRealWebcam_CaptureWithSize UsingRealWebcam_CaptureWithSize #define MAYBE_UsingRealWebcam_CheckPhotoCallbackRelease \ UsingRealWebcam_CheckPhotoCallbackRelease #elif defined(OS_LINUX)