| 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 4e705be4b6c81bb9a7678f81fb320ebf7ae0dad6..4fec4646bc76d041cc33fe12926bfd2d881552a7 100644
|
| --- a/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
|
| +++ b/chrome/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
|
| @@ -245,7 +245,15 @@ IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest, Condition) {
|
| // Note: This test depends on the timing in cache backends and can be flaky
|
| // if those backends are slow. If this turns out to be a problem, consider
|
| // increasing the |timeout_ms| constant.
|
| -IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest, TimeAndURL) {
|
| +//
|
| +// Flakily timing out on Mac 10.11: https://crbug.com/646119
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_TimeAndURL DISABLED_TimeAndURL
|
| +#else
|
| +#define MAYBE_TimeAndURL TimeAndURL
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest,
|
| + MAYBE_TimeAndURL) {
|
| const int64_t timeout_ms = 1;
|
|
|
| // Create some entries.
|
|
|