| 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 2ba8c0217db3677a2916457dffb51f717dad7277..740f6ba76c1ec7b5b34b1190f66d85e4d7073bbf 100644
|
| --- a/chrome/browser/metrics/metrics_service_browsertest.cc
|
| +++ b/chrome/browser/metrics/metrics_service_browsertest.cc
|
| @@ -77,7 +77,8 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceBrowserTest, CloseRenderersNormally) {
|
| // Flaky on Linux. See http://crbug.com/131094
|
| // Child crashes fail the process on ASan (see crbug.com/411251,
|
| // crbug.com/368525).
|
| -#if defined(OS_LINUX) || defined(ADDRESS_SANITIZER)
|
| +// Flaky failing DCHECK on Windows, see crbug.com/635770
|
| +#if defined(OS_LINUX) || defined(ADDRESS_SANITIZER) || defined(OS_WIN)
|
| #define MAYBE_CrashRenderers DISABLED_CrashRenderers
|
| #else
|
| #define MAYBE_CrashRenderers CrashRenderers
|
| @@ -112,4 +113,3 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceBrowserTest, MAYBE_CrashRenderers) {
|
| // is set to true, but this preference isn't set until the browser
|
| // exits... it's not clear to me how to test that.
|
| }
|
| -
|
|
|