Chromium Code Reviews| 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 c371d73551b2669da01b36ec97a50edb6c95197e..c2367bd117eeac28da48e504a59bc33c0fa49e41 100644 |
| --- a/chrome/browser/metrics/metrics_service_browsertest.cc |
| +++ b/chrome/browser/metrics/metrics_service_browsertest.cc |
| @@ -27,6 +27,7 @@ |
| #include "components/prefs/pref_service.h" |
| #include "content/public/test/browser_test_utils.h" |
| #include "net/base/filename_util.h" |
| +#include "services/service_manager/embedder/switches.h" |
| #include "ui/base/window_open_disposition.h" |
| #include "url/gurl.h" |
| @@ -195,6 +196,11 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceBrowserTest, MAYBE_CheckCrashRenderers) { |
| // OOM code only works on Windows. |
| #if defined(OS_WIN) && !defined(ADDRESS_SANITIZER) |
| IN_PROC_BROWSER_TEST_F(MetricsServiceBrowserTest, OOMRenderers) { |
| + // Disable stack traces during this test since DbgHelp is unreliable in |
| + // low-memory conditions (see crbug.com/692564). |
| + base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| + service_manager::switches::kDisableInProcessStackTraces); |
|
Will Harris
2017/05/12 16:46:33
I'm not too familiar with this switch, but does it
|
| + |
| base::HistogramTester histogram_tester; |
| OpenTabsAndNavigateToCrashyUrl(content::kChromeUIMemoryExhaustURL); |