diff options
Diffstat (limited to 'chrome/test/base/tracing_browsertest.cc')
| -rw-r--r-- | chrome/test/base/tracing_browsertest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc index 1b95359..38e2083 100644 --- a/chrome/test/base/tracing_browsertest.cc +++ b/chrome/test/base/tracing_browsertest.cc @@ -153,13 +153,19 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, BeginTracingWithWatch) { ASSERT_TRUE(EndTracing(&json_events)); } +#if defined(OS_WIN) +#define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra +#else +#define MAYBE_TestMemoryInfra TestMemoryInfra +#endif + // Multi-process mode. -IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) { +IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestMemoryInfra) { PerformDumpMemoryTestActions(); } // Single-process mode. -IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, TestMemoryInfra) { +IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, MAYBE_TestMemoryInfra) { PerformDumpMemoryTestActions(); } |