| Index: chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
|
| diff --git a/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc b/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
|
| index 59b5e53d0ba38331dadfd9baa879bdf8e791022c..5660dd277c4d0af66c80ff0207ba61ee922d1bc3 100644
|
| --- a/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
|
| +++ b/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
|
| @@ -246,8 +246,9 @@ IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest, Condition) {
|
| // if those backends are slow. If this turns out to be a problem, consider
|
| // increasing the |timeout_ms| constant.
|
| //
|
| -// Flakily timing out on Mac 10.11: https://crbug.com/646119
|
| -#if defined(OS_MACOSX)
|
| +// Flakily timing out on Mac 10.11 (crbug.com/646119) and flakily
|
| +// failing on Linux/ChromeOS (crbug.com/624836).
|
| +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| #define MAYBE_TimeAndURL DISABLED_TimeAndURL
|
| #else
|
| #define MAYBE_TimeAndURL TimeAndURL
|
|
|