| Index: chrome/browser/metrics/metrics_service_browsertest.cc
|
| diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc
|
| index 4243b08a16d579fb370aa12d5f63431d46331a50..f77221c3554d14768e26fce63beb38c68933311a 100644
|
| --- a/chrome/browser/metrics/metrics_service_browsertest.cc
|
| +++ b/chrome/browser/metrics/metrics_service_browsertest.cc
|
| @@ -74,7 +74,9 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceBrowserTest, CloseRenderersNormally) {
|
| }
|
|
|
| // Flaky on Linux. See http://crbug.com/131094
|
| -#if defined(OS_LINUX)
|
| +// Child crashes fail the process on ASan (see crbug.com/411251,
|
| +// crbug.com/368525).
|
| +#if defined(OS_LINUX) || defined(ADDRESS_SANITIZER)
|
| #define MAYBE_CrashRenderers DISABLED_CrashRenderers
|
| #else
|
| #define MAYBE_CrashRenderers CrashRenderers
|
|
|