diff options
| author | lukasza <lukasza@chromium.org> | 2016-01-07 19:03:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-08 03:04:44 +0000 |
| commit | d860e2d6711d51df34773f50053dee124f45e3b9 (patch) | |
| tree | c17ab6148eb055a31465acf996c31f4be658079e | |
| parent | 32569c6744b9dc3589fb67f9e25857ba138ed76d (diff) | |
| download | chromium_src-d860e2d6711d51df34773f50053dee124f45e3b9.zip chromium_src-d860e2d6711d51df34773f50053dee124f45e3b9.tar.gz chromium_src-d860e2d6711d51df34773f50053dee124f45e3b9.tar.bz2 | |
Revert of Disabling SingleProcess*Tracing*Test and MemoryInfraTest tests on Windows. (patchset #1 id:1 of https://codereview.chromium.org/1568913004/ )
Reason for revert:
Disabling not needed after all - the tree is green after https://codereview.chromium.org/1571533002/ has landed.
Original issue's description:
> Disabling SingleProcess*Tracing*Test and MemoryInfraTest tests on Windows.
>
> BUG=575377
> TBR=simonhatch@chromium.org, primiano@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/0e8c1e4542196af2d0650c4cfebd990c43329e43
TBR=primiano@chromium.org,simonhatch@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=575377
Review URL: https://codereview.chromium.org/1567323002
Cr-Commit-Position: refs/heads/master@{#368259}
| -rw-r--r-- | chrome/test/base/tracing_browsertest.cc | 10 | ||||
| -rw-r--r-- | content/browser/tracing/memory_tracing_browsertest.cc | 15 |
2 files changed, 4 insertions, 21 deletions
diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc index 38e2083..1b95359 100644 --- a/chrome/test/base/tracing_browsertest.cc +++ b/chrome/test/base/tracing_browsertest.cc @@ -153,19 +153,13 @@ 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, MAYBE_TestMemoryInfra) { +IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) { PerformDumpMemoryTestActions(); } // Single-process mode. -IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, MAYBE_TestMemoryInfra) { +IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, TestMemoryInfra) { PerformDumpMemoryTestActions(); } 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(_,_)) |