Commit cdd7edf8 authored by Sean McAllister's avatar Sean McAllister Committed by Commit Bot

Refactor OS_LINUX preprocessor directive for LaCrOS effort.

Currently, ChromeOS defines the OS_LINUX directive as well as
OS_CHROMEOS.  We're working to separate these two, so we're
making the fact that OS_LINUX == OS_LINUX || OS_CHROMEOS
explicit.

This is changes for /content/browser/webrtc

This CL was uploaded by git cl split.

R=emircan@chromium.org

Bug: 1110266
Change-Id: I6e48d5cc5ddc73cc16f90975b8467e9ea7d42b33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2371291Reviewed-by: default avatarEmircan Uysaler <emircan@chromium.org>
Commit-Queue: Sean McAllister <smcallis@google.com>
Cr-Commit-Position: refs/heads/master@{#802491}
parent 9b8df9af
...@@ -84,7 +84,7 @@ class WebRtcAudioDebugRecordingsBrowserTest ...@@ -84,7 +84,7 @@ class WebRtcAudioDebugRecordingsBrowserTest
~WebRtcAudioDebugRecordingsBrowserTest() override {} ~WebRtcAudioDebugRecordingsBrowserTest() override {}
}; };
#if defined(OS_ANDROID) || defined(OS_LINUX) #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
// Renderer crashes under Android ASAN: https://crbug.com/408496. // Renderer crashes under Android ASAN: https://crbug.com/408496.
// Renderer crashes under Android: https://crbug.com/820934. // Renderer crashes under Android: https://crbug.com/820934.
// Failures on Android M. https://crbug.com/535728. // Failures on Android M. https://crbug.com/535728.
......
...@@ -67,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcDataBrowserTest, CallWithSctpDataOnly) { ...@@ -67,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcDataBrowserTest, CallWithSctpDataOnly) {
// dataChannel and audio and video tracks. // dataChannel and audio and video tracks.
// TODO(mallinath) - Remove this test after rtp based data channel is disabled. // TODO(mallinath) - Remove this test after rtp based data channel is disabled.
// Flaky. crbug.com/986872 // Flaky. crbug.com/986872
#if defined(OS_LINUX) || defined(OS_WIN) #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
#define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia #define MAYBE_CallWithDataAndMedia DISABLED_CallWithDataAndMedia
#else #else
#define MAYBE_CallWithDataAndMedia CallWithDataAndMedia #define MAYBE_CallWithDataAndMedia CallWithDataAndMedia
......
...@@ -275,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, ...@@ -275,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
} }
// TODO(crbug.com/571389): Flaky on TSAN bots. // TODO(crbug.com/571389): Flaky on TSAN bots.
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_GetUserMediaWithMandatorySourceID \ #define MAYBE_GetUserMediaWithMandatorySourceID \
DISABLED_GetUserMediaWithMandatorySourceID DISABLED_GetUserMediaWithMandatorySourceID
#else #else
...@@ -739,7 +739,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, ...@@ -739,7 +739,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
// Flaky on Win, see https://crbug.com/915135 // Flaky on Win, see https://crbug.com/915135
// Flaky on Linux, see https://crbug.com/952381 // Flaky on Linux, see https://crbug.com/952381
#if defined(OS_WIN) || defined(OS_LINUX) #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_ApplyConstraintsNonDevice DISABLED_ApplyConstraintsNonDevice #define MAYBE_ApplyConstraintsNonDevice DISABLED_ApplyConstraintsNonDevice
#else #else
#define MAYBE_ApplyConstraintsNonDevice ApplyConstraintsNonDevice #define MAYBE_ApplyConstraintsNonDevice ApplyConstraintsNonDevice
......
...@@ -42,13 +42,13 @@ namespace content { ...@@ -42,13 +42,13 @@ namespace content {
// TODO(crbug.com/793859, crbug.com/986602): This test is broken on Android // TODO(crbug.com/793859, crbug.com/986602): This test is broken on Android
// (see above) and flaky on Linux. // (see above) and flaky on Linux.
#if defined(OS_ANDROID) || defined(OS_LINUX) #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_ManipulateExposureTime DISABLED_ManipulateExposureTime #define MAYBE_ManipulateExposureTime DISABLED_ManipulateExposureTime
#else #else
#define MAYBE_ManipulateExposureTime ManipulateExposureTime #define MAYBE_ManipulateExposureTime ManipulateExposureTime
#endif #endif
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_CHROMEOS)
// See crbug/986470 // See crbug/986470
#define MAYBE_GetPhotoSettings DISABLED_GetPhotoSettings #define MAYBE_GetPhotoSettings DISABLED_GetPhotoSettings
#define MAYBE_GetTrackSettings DISABLED_GetTrackSettings #define MAYBE_GetTrackSettings DISABLED_GetTrackSettings
...@@ -191,7 +191,7 @@ class WebRtcImageCaptureSucceedsBrowserTest ...@@ -191,7 +191,7 @@ class WebRtcImageCaptureSucceedsBrowserTest
}; };
// TODO(crbug.com/998305): Flaky on Linux. // TODO(crbug.com/998305): Flaky on Linux.
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_GetPhotoCapabilities DISABLED_GetPhotoCapabilities #define MAYBE_GetPhotoCapabilities DISABLED_GetPhotoCapabilities
#else #else
#define MAYBE_GetPhotoCapabilities GetPhotoCapabilities #define MAYBE_GetPhotoCapabilities GetPhotoCapabilities
...@@ -221,7 +221,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest, GrabFrame) { ...@@ -221,7 +221,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest, GrabFrame) {
} }
// Flaky. crbug.com/998116 // Flaky. crbug.com/998116
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_GetTrackCapabilities DISABLED_GetTrackCapabilities #define MAYBE_GetTrackCapabilities DISABLED_GetTrackCapabilities
#else #else
#define MAYBE_GetTrackCapabilities GetTrackCapabilities #define MAYBE_GetTrackCapabilities GetTrackCapabilities
...@@ -247,7 +247,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest, ...@@ -247,7 +247,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureSucceedsBrowserTest,
// TODO(crbug.com/998304): Flaky on Linux. // TODO(crbug.com/998304): Flaky on Linux.
// TODO(crbug.com/793859): Re-enable test on Android as soon as the cause for // TODO(crbug.com/793859): Re-enable test on Android as soon as the cause for
// the bug is understood and fixed. // the bug is understood and fixed.
#if defined(OS_LINUX) || defined(OS_ANDROID) #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
#define MAYBE_ManipulateTilt DISABLED_ManipulateTilt #define MAYBE_ManipulateTilt DISABLED_ManipulateTilt
#else #else
#define MAYBE_ManipulateTilt ManipulateTilt #define MAYBE_ManipulateTilt ManipulateTilt
...@@ -289,8 +289,8 @@ INSTANTIATE_TEST_SUITE_P( ...@@ -289,8 +289,8 @@ INSTANTIATE_TEST_SUITE_P(
// API has already been implemented. // API has already been implemented.
// Note, these tests must be run sequentially, since multiple parallel test runs // Note, these tests must be run sequentially, since multiple parallel test runs
// competing for a single physical webcam typically causes failures. // competing for a single physical webcam typically causes failures.
#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_ANDROID) || \ #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
defined(OS_WIN) defined(OS_ANDROID) || defined(OS_WIN)
const TargetVideoCaptureImplementation const TargetVideoCaptureImplementation
kTargetVideoCaptureImplementationsForRealWebcam[] = { kTargetVideoCaptureImplementationsForRealWebcam[] = {
......
...@@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, Pause) { ...@@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, Pause) {
} }
// TODO(crbug.com/571389): Flaky on TSAN bots. // TODO(crbug.com/571389): Flaky on TSAN bots.
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_PauseStop DISABLED_PauseStop #define MAYBE_PauseStop DISABLED_PauseStop
#else #else
#define MAYBE_PauseStop PauseStop #define MAYBE_PauseStop PauseStop
...@@ -141,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, ...@@ -141,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
} }
// TODO (crbug.com/736268): Flaky on Linux TSan bots. // TODO (crbug.com/736268): Flaky on Linux TSan bots.
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_IllegalPauseThrowsDOMError DISABLED_IllegalPauseThrowsDOMError #define MAYBE_IllegalPauseThrowsDOMError DISABLED_IllegalPauseThrowsDOMError
#else #else
#define MAYBE_IllegalPauseThrowsDOMError IllegalPauseThrowsDOMError #define MAYBE_IllegalPauseThrowsDOMError IllegalPauseThrowsDOMError
...@@ -181,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, ...@@ -181,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
} }
// Flaky on Linux Tsan (crbug.com/736268) // Flaky on Linux Tsan (crbug.com/736268)
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_IllegalRequestDataThrowsDOMError \ #define MAYBE_IllegalRequestDataThrowsDOMError \
DISABLED_IllegalRequestDataThrowsDOMError DISABLED_IllegalRequestDataThrowsDOMError
#else #else
...@@ -197,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, ...@@ -197,7 +197,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
// These tests are flakily timing out on emulators (https://crbug.com/716691) // These tests are flakily timing out on emulators (https://crbug.com/716691)
// and/or under Android ASAN (https://crbug.com/693565); // and/or under Android ASAN (https://crbug.com/693565);
#define MAYBE_PeerConnection DISABLED_PeerConnection #define MAYBE_PeerConnection DISABLED_PeerConnection
#elif defined(OS_LINUX) && defined(THREAD_SANITIZER) #elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(THREAD_SANITIZER)
// Flaky on Linux TSan, https://crbug.com/694373. // Flaky on Linux TSan, https://crbug.com/694373.
#define MAYBE_PeerConnection DISABLED_PeerConnection #define MAYBE_PeerConnection DISABLED_PeerConnection
#elif defined(OS_WIN) && !defined(NDEBUG) #elif defined(OS_WIN) && !defined(NDEBUG)
...@@ -215,7 +215,7 @@ IN_PROC_BROWSER_TEST_P(MAYBE_WebRtcMediaRecorderTest, MAYBE_PeerConnection) { ...@@ -215,7 +215,7 @@ IN_PROC_BROWSER_TEST_P(MAYBE_WebRtcMediaRecorderTest, MAYBE_PeerConnection) {
} }
// Flaky on Linux Tsan (crbug.com/736268) // Flaky on Linux Tsan (crbug.com/736268)
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_CHROMEOS)
#define MAYBE_AddingTrackToMediaStreamFiresErrorEvent \ #define MAYBE_AddingTrackToMediaStreamFiresErrorEvent \
DISABLED_AddingTrackToMediaStreamFiresErrorEvent DISABLED_AddingTrackToMediaStreamFiresErrorEvent
#else #else
......
...@@ -105,8 +105,8 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureStressBrowserTest, ...@@ -105,8 +105,8 @@ IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureStressBrowserTest,
// API has already been implemented. // API has already been implemented.
// Note, these tests must be run sequentially, since multiple parallel test runs // Note, these tests must be run sequentially, since multiple parallel test runs
// competing for a single physical webcam typically causes failures. // competing for a single physical webcam typically causes failures.
#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_ANDROID) || \ #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
defined(OS_WIN) defined(OS_ANDROID) || defined(OS_WIN)
const TargetVideoCaptureImplementation const TargetVideoCaptureImplementation
kTargetVideoCaptureImplementationsForRealWebcam[] = { kTargetVideoCaptureImplementationsForRealWebcam[] = {
......
...@@ -282,7 +282,7 @@ INSTANTIATE_TEST_SUITE_P( ...@@ -282,7 +282,7 @@ INSTANTIATE_TEST_SUITE_P(
TestParams { TestParams {
ServiceApi::kMultiClient, media::VideoCaptureBufferType::kSharedMemory ServiceApi::kMultiClient, media::VideoCaptureBufferType::kSharedMemory
} }
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_CHROMEOS)
, ,
TestParams{ TestParams{
ServiceApi::kSingleClient, ServiceApi::kSingleClient,
...@@ -291,7 +291,7 @@ INSTANTIATE_TEST_SUITE_P( ...@@ -291,7 +291,7 @@ INSTANTIATE_TEST_SUITE_P(
ServiceApi::kMultiClient, ServiceApi::kMultiClient,
media::VideoCaptureBufferType::kSharedMemoryViaRawFileDescriptor media::VideoCaptureBufferType::kSharedMemoryViaRawFileDescriptor
} }
#endif // defined(OS_LINUX) #endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
)); ));
} // namespace content } // namespace content
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