Commit 0e00efb5 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Remove use of MAC_OS_X_VERSION_10_12

MAC_OS_X_VERSION_10_12 is true if Chromium is being built with the
macOS 10.12 SDK or newer, as it’s been since mid 2017.

MAC_OS_X_VERSION_10_12 is not a runtime check for macOS 10.12
and cannot be used as such.

Bug: 1044838
Change-Id: Ia8e40d0f3aab0405e423847dcf9ea1ea2f535091
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2016846
Auto-Submit: Avi Drissman <avi@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734617}
parent b7475afc
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
#include "media/capture/video_capture_types.h" #include "media/capture/video_capture_types.h"
#include "testing/gmock/include/gmock/gmock.h" #include "testing/gmock/include/gmock/gmock.h"
#if defined(OS_MACOSX)
#include "base/mac/mac_util.h"
#endif
using testing::_; using testing::_;
using testing::AtLeast; using testing::AtLeast;
using testing::Bool; using testing::Bool;
...@@ -257,8 +261,7 @@ IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, StartAndImmediatelyStop) { ...@@ -257,8 +261,7 @@ IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, StartAndImmediatelyStop) {
} }
// Flaky on MSAN. https://crbug.com/840294 // Flaky on MSAN. https://crbug.com/840294
// Flaky on MacOS 10.12. https://crbug.com/938074 #if defined(MEMORY_SANITIZER)
#if defined(MEMORY_SANITIZER) || defined(MAC_OS_X_VERSION_10_12)
#define MAYBE_ReceiveFramesFromFakeCaptureDevice \ #define MAYBE_ReceiveFramesFromFakeCaptureDevice \
DISABLED_ReceiveFramesFromFakeCaptureDevice DISABLED_ReceiveFramesFromFakeCaptureDevice
#else #else
...@@ -267,6 +270,13 @@ IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, StartAndImmediatelyStop) { ...@@ -267,6 +270,13 @@ IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, StartAndImmediatelyStop) {
#endif #endif
IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest,
MAYBE_ReceiveFramesFromFakeCaptureDevice) { MAYBE_ReceiveFramesFromFakeCaptureDevice) {
#if defined(OS_MACOSX)
if (base::mac::IsOS10_12()) {
// Flaky on MacOS 10.12. https://crbug.com/938074
return;
}
#endif
// Only fake device with index 2 delivers MJPEG. // Only fake device with index 2 delivers MJPEG.
if (params_.exercise_accelerated_jpeg_decoding && if (params_.exercise_accelerated_jpeg_decoding &&
params_.device_index_to_use != 2) { params_.device_index_to_use != 2) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment