Re-enable capture_unittests on WebRTC bots except windows.

The tests are clearly broken on Windows if a webcam is plugged in.
They pass on win10 but only because they're disabled there. See bug
for example breakages on Windows.

Bug: 893494
Change-Id: I8ea43cc4e3ef23082246ff23ec635f2ec5bfbbe2
Reviewed-on: https://chromium-review.googlesource.com/c/1309789Reviewed-by: Emircan Uysaler <emircan@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Patrik Höglund <phoglund@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606038}

media/capture/video/video_capture_device_unittest.cc

@@ -64,17 +64,26 @@
 #define MAYBE_UsingRealWebcam_CaptureMjpeg DISABLED_UsingRealWebcam_CaptureMjpeg
 #define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
 #define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
+#define MAYBE_UsingRealWebcam_CheckPhotoCallbackRelease \
+  UsingRealWebcam_CheckPhotoCallbackRelease
 #elif defined(OS_WIN)
-#define MAYBE_UsingRealWebcam_AllocateBadSize UsingRealWebcam_AllocateBadSize
-#define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
-#define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
-#define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
+// TODO(crbug.com/893494): Fails on win: error: Value of: device_descriptor.
+#define MAYBE_UsingRealWebcam_AllocateBadSize \
+  DISABLED_UsingRealWebcam_AllocateBadSize
+#define MAYBE_UsingRealWebcam_CaptureMjpeg DISABLED_UsingRealWebcam_CaptureMjpeg
+#define MAYBE_UsingRealWebcam_TakePhoto DISABLED_UsingRealWebcam_TakePhoto
+#define MAYBE_UsingRealWebcam_GetPhotoState \
+  DISABLED_UsingRealWebcam_GetPhotoState
+#define MAYBE_UsingRealWebcam_CheckPhotoCallbackRelease \
+  DISABLED_UsingRealWebcam_CheckPhotoCallbackRelease
 #elif defined(OS_ANDROID)
 #define MAYBE_UsingRealWebcam_AllocateBadSize UsingRealWebcam_AllocateBadSize
 #define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
 #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_CHROMEOS)
 #define MAYBE_UsingRealWebcam_AllocateBadSize \
   DISABLED_UsingRealWebcam_AllocateBadSize
@@ -82,6 +91,8 @@
 #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)
 // UsingRealWebcam_AllocateBadSize will hang when a real camera is attached and
 // if more than one test is trying to use the camera (even across processes). Do
@@ -92,12 +103,16 @@
 #define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
 #define MAYBE_UsingRealWebcam_TakePhoto UsingRealWebcam_TakePhoto
 #define MAYBE_UsingRealWebcam_GetPhotoState UsingRealWebcam_GetPhotoState
+#define MAYBE_UsingRealWebcam_CheckPhotoCallbackRelease \
+  UsingRealWebcam_CheckPhotoCallbackRelease
 #else
 #define MAYBE_UsingRealWebcam_AllocateBadSize UsingRealWebcam_AllocateBadSize
 #define MAYBE_UsingRealWebcam_CaptureMjpeg UsingRealWebcam_CaptureMjpeg
 #define MAYBE_UsingRealWebcam_TakePhoto DISABLED_UsingRealWebcam_TakePhoto
 #define MAYBE_UsingRealWebcam_GetPhotoState \
   DISABLED_UsingRealWebcam_GetPhotoState
+#define MAYBE_UsingRealWebcam_CheckPhotoCallbackRelease \
+  UsingRealWebcam_CheckPhotoCallbackRelease
 #endif
 
 // Wrap the TEST_P macro into another one to allow to preprocess |test_name|
@@ -794,7 +809,7 @@ void VideoCaptureDeviceTest::RunGetPhotoStateTestCase() {
 #if defined(OS_WIN)
 // Verifies that the photo callback is correctly released by MediaFoundation
 WRAPPED_TEST_P(VideoCaptureDeviceTest,
-               UsingRealWebcam_CheckPhotoCallbackRelease) {
+               MAYBE_UsingRealWebcam_CheckPhotoCallbackRelease) {
   if (!UseWinMediaFoundation())
     return;
 

testing/buildbot/chromium.webrtc.json

@@ -65,8 +65,7 @@
           "--enable-logging",
           "--v=1",
           "--test-launcher-jobs=1",
-          "--test-launcher-print-test-stdio=always",
-          "--gtest_filter=-*UsingRealWebcam*"
+          "--test-launcher-print-test-stdio=always"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -170,8 +169,7 @@
           "--enable-logging",
           "--v=1",
           "--test-launcher-jobs=1",
-          "--test-launcher-print-test-stdio=always",
-          "--gtest_filter=-*UsingRealWebcam*"
+          "--test-launcher-print-test-stdio=always"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -276,8 +274,7 @@
           "--enable-logging",
           "--v=1",
           "--test-launcher-jobs=1",
-          "--test-launcher-print-test-stdio=always",
-          "--gtest_filter=-*UsingRealWebcam*"
+          "--test-launcher-print-test-stdio=always"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -374,8 +371,7 @@
           "--enable-logging",
           "--v=1",
           "--test-launcher-jobs=1",
-          "--test-launcher-print-test-stdio=always",
-          "--gtest_filter=-*UsingRealWebcam*"
+          "--test-launcher-print-test-stdio=always"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -473,8 +469,7 @@
           "--enable-logging",
           "--v=1",
           "--test-launcher-jobs=1",
-          "--test-launcher-print-test-stdio=always",
-          "--gtest_filter=-*UsingRealWebcam*"
+          "--test-launcher-print-test-stdio=always"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false

testing/buildbot/test_suites.pyl

@@ -2333,10 +2333,7 @@
       # Run capture unittests as well since our bots have real webcams.
       'capture_unittests': {
         'args': ['--enable-logging', '--v=1', '--test-launcher-jobs=1',
-                 '--test-launcher-print-test-stdio=always',
-                 # TODO(crbug.com/893494): Remove once real webcams are fixed
-                 # on chromium.webrtc Mac and Win bots.
-                 '--gtest_filter=-*UsingRealWebcam*'],
+                 '--test-launcher-print-test-stdio=always'],
         'swarming': {
           'can_use_on_swarming_builders': False,
         },