Disable failing resolutions for Webcam test on Win8 bot

chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc

Index: chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc
diff --git a/chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc b/chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc
index 49665dd84fd713bf8293da30e28507aada04e955..5f5f39dcd862836beb90bd7368022eb9d32dbe2b 100644
--- a/chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_webcam_browsertest.cc
@@ -83,12 +83,27 @@ IN_PROC_BROWSER_TEST_P(WebRtcWebcamBrowserTest,
     return;
   }
 
+  // We have a Win8 bot failing at resolution "1280x720", which may or may not
+  // be due to its physical webcam not supporting that resolution.
+  // We disable those resolutions for Win8 until we find the root cause.
+  // See crbug.com/676041

[mcasas, 2016/12/20 18:57:41]

nit: can you rephrase this comment more TODO-ish plz?

// TODO(chfremer): Reenable these tests, https://crbug.com/676041.

[chfremer, 2016/12/20 19:11:00]

Done.

+  bool disable_720p_and_up = false;
+#if defined(OS_WIN)

[emircan, 2016/12/20 18:57:28]

Can you move this #if clause to 104 and return inside? You wouldn't need
|disable_720p_and_up| then.

[chfremer, 2016/12/20 19:11:00]

Done.

+  auto win_version = base::win::GetVersion();
+  disable_720p_and_up =
+      (win_version == VERSION_WIN8 || win_version == VERSION_WIN8_1);
+#endif
+
   EXPECT_EQ("320x240",
             GetUserMediaAndGetStreamSize(tab, kVideoCallConstraintsQVGA));
   EXPECT_EQ("640x480",
             GetUserMediaAndGetStreamSize(tab, kVideoCallConstraintsVGA));
   EXPECT_EQ("640x360",
             GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints360p));
+
+  if (disable_720p_and_up)
+    return;
+
   EXPECT_EQ("1280x720",
             GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p));
   EXPECT_EQ("1920x1080",