| Index: base/trace_event/memory_dump_scheduler_unittest.cc
|
| diff --git a/base/trace_event/memory_dump_scheduler_unittest.cc b/base/trace_event/memory_dump_scheduler_unittest.cc
|
| index 17fb74361f5f47a4889a5c1cf5ead8598067b53a..0a5fb89f4e218ff2e33fdcc20624c9c4acfdab8a 100644
|
| --- a/base/trace_event/memory_dump_scheduler_unittest.cc
|
| +++ b/base/trace_event/memory_dump_scheduler_unittest.cc
|
| @@ -88,7 +88,13 @@ TEST_F(MemoryDumpSchedulerTest, SingleTrigger) {
|
| scheduler_->Stop();
|
| }
|
|
|
| -TEST_F(MemoryDumpSchedulerTest, MultipleTriggers) {
|
| +// Flaky on Linux. http://crbug.com/732861
|
| +#if defined(OS_LINUX)
|
| +#define MAYBE_MultipleTriggers DISABLED_MultipleTriggers
|
| +#else
|
| +#define MAYBE_MultipleTriggers MultipleTriggers
|
| +#endif
|
| +TEST_F(MemoryDumpSchedulerTest, MAYBE_MultipleTriggers) {
|
| const uint32_t kPeriodLightMs = 3;
|
| const uint32_t kPeriodDetailedMs = 9;
|
| WaitableEvent evt(WaitableEvent::ResetPolicy::MANUAL,
|
|
|