diff options
Diffstat (limited to 'content/browser/tracing/memory_tracing_browsertest.cc')
| -rw-r--r-- | content/browser/tracing/memory_tracing_browsertest.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/content/browser/tracing/memory_tracing_browsertest.cc b/content/browser/tracing/memory_tracing_browsertest.cc index 2e2255d..13b0923 100644 --- a/content/browser/tracing/memory_tracing_browsertest.cc +++ b/content/browser/tracing/memory_tracing_browsertest.cc @@ -161,15 +161,10 @@ IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, DisableTracing(); } -#if defined(OS_WIN) -#define MAYBE_RendererInitiatedSingleDump DISABLED_RendererInitiatedSingleDump -#else -#define MAYBE_RendererInitiatedSingleDump RendererInitiatedSingleDump -#endif // Checks that a memory dump initiated from a renderer thread ends up in a // single dump even in single process mode. IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, - MAYBE_RendererInitiatedSingleDump) { + RendererInitiatedSingleDump) { Navigate(shell()); EXPECT_CALL(*mock_dump_provider_, OnMemoryDump(_,_)).WillOnce(Return(true)); @@ -182,13 +177,7 @@ IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, DisableTracing(); } -#if defined(OS_WIN) -#define MAYBE_ManyInterleavedDumps DISABLED_ManyInterleavedDumps -#else -#define MAYBE_ManyInterleavedDumps ManyInterleavedDumps -#endif -IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, - MAYBE_ManyInterleavedDumps) { +IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, ManyInterleavedDumps) { Navigate(shell()); EXPECT_CALL(*mock_dump_provider_, OnMemoryDump(_,_)) |