| Index: chrome/browser/image_decoder_browsertest.cc
|
| diff --git a/chrome/browser/image_decoder_browsertest.cc b/chrome/browser/image_decoder_browsertest.cc
|
| index 2586259e36d43ba5bc06cae30795c579ebc475bc..314e1b88fb117016b8de4c4f999c6988b9d364e5 100644
|
| --- a/chrome/browser/image_decoder_browsertest.cc
|
| +++ b/chrome/browser/image_decoder_browsertest.cc
|
| @@ -244,9 +244,11 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, StartAndDestroy) {
|
| // UI thread but ImageDecoder does its work mainly on the IO thread. So the test
|
| // checks for both possible valid outcomes.
|
| //
|
| -// Flaky timeouts on Linux ASan / LSan. crbug.com/618206
|
| +// Flaky timeouts on Linux ASan / LSan, and on Mac. crbug.com/618206
|
| #if (defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER)) && defined(OS_LINUX)
|
| #define MAYBE_StartAndKillProcess DISABLED_StartAndKillProcess
|
| +#elif defined(OS_MACOSX)
|
| +#define MAYBE_StartAndKillProcess DISABLED_StartAndKillProcess
|
| #else
|
| #define MAYBE_StartAndKillProcess StartAndKillProcess
|
| #endif
|
|
|