OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/base/tracing.h" | 5 #include "chrome/test/base/tracing.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 EXPECT_TRUE(WaitForWatchEvent(no_timeout)); | 162 EXPECT_TRUE(WaitForWatchEvent(no_timeout)); |
163 ASSERT_TRUE(EndTracing(&json_events)); | 163 ASSERT_TRUE(EndTracing(&json_events)); |
164 } | 164 } |
165 | 165 |
166 // Multi-process mode. | 166 // Multi-process mode. |
167 IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) { | 167 IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) { |
168 PerformDumpMemoryTestActions(); | 168 PerformDumpMemoryTestActions(); |
169 } | 169 } |
170 | 170 |
171 // Single-process mode. | 171 // Single-process mode. |
172 IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, TestMemoryInfra) { | 172 // Flaky (leaking) on linux_chromium_asan_rel_ng: https://crbug.com/585026 |
| 173 #if defined(ADDRESS_SANITIZER) |
| 174 #define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra |
| 175 #else |
| 176 #define MAYBE_TestMemoryInfra TestMemoryInfra |
| 177 #endif |
| 178 IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, MAYBE_TestMemoryInfra) { |
173 PerformDumpMemoryTestActions(); | 179 PerformDumpMemoryTestActions(); |
174 } | 180 } |
175 | 181 |
176 } // namespace | 182 } // namespace |
OLD | NEW |