| Index: chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc
|
| diff --git a/chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc b/chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc
|
| index 0c8fed532680da79bb3fe5b2de19abada54fbf86..80d13e90ff4f412d369503a047b5bdcbe5191f69 100644
|
| --- a/chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc
|
| +++ b/chrome/browser/media/chrome_webrtc_simulcast_browsertest.cc
|
| @@ -41,9 +41,9 @@ class WebRtcSimulcastBrowserTest : public WebRtcTestBase {
|
| }
|
| };
|
|
|
| -// Fails/times out on Win only. http://crbug.com/452623
|
| +// Fails/times out on Windows and Chrome OS. http://crbug.com/452623
|
| // MSan reports errors. http://crbug.com/452892
|
| -#if defined(OS_WIN) || defined(MEMORY_SANITIZER)
|
| +#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(MEMORY_SANITIZER)
|
| #define MAYBE_TestVgaReturnsTwoSimulcastStreams DISABLED_TestVgaReturnsTwoSimulcastStreams
|
| #else
|
| #define MAYBE_TestVgaReturnsTwoSimulcastStreams TestVgaReturnsTwoSimulcastStreams
|
|
|