| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 }; | 100 }; |
| 101 | 101 |
| 102 IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) { | 102 IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) { |
| 103 PerformDumpMemoryTestActions( | 103 PerformDumpMemoryTestActions( |
| 104 base::trace_event::TraceConfig( | 104 base::trace_event::TraceConfig( |
| 105 base::trace_event::TraceConfigMemoryTestUtil:: | 105 base::trace_event::TraceConfigMemoryTestUtil:: |
| 106 GetTraceConfig_EmptyTriggers()), | 106 GetTraceConfig_EmptyTriggers()), |
| 107 base::trace_event::MemoryDumpLevelOfDetail::DETAILED); | 107 base::trace_event::MemoryDumpLevelOfDetail::DETAILED); |
| 108 } | 108 } |
| 109 | 109 |
| 110 IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestBackgroundMemoryInfra) { | 110 // crbug.com/708487. |
| 111 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) |
| 112 #define MAYBE_TestBackgroundMemoryInfra DISABLED_TestBackgroundMemoryInfra |
| 113 #else |
| 114 #define MAYBE_TestBackgroundMemoryInfra TestBackgroundMemoryInfra |
| 115 #endif // defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) |
| 116 IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestBackgroundMemoryInfra) { |
| 111 PerformDumpMemoryTestActions( | 117 PerformDumpMemoryTestActions( |
| 112 base::trace_event::TraceConfig( | 118 base::trace_event::TraceConfig( |
| 113 base::trace_event::TraceConfigMemoryTestUtil:: | 119 base::trace_event::TraceConfigMemoryTestUtil:: |
| 114 GetTraceConfig_BackgroundTrigger(200)), | 120 GetTraceConfig_BackgroundTrigger(200)), |
| 115 base::trace_event::MemoryDumpLevelOfDetail::BACKGROUND); | 121 base::trace_event::MemoryDumpLevelOfDetail::BACKGROUND); |
| 116 } | 122 } |
| 117 | 123 |
| 118 } // namespace | 124 } // namespace |
| OLD | NEW |