| Index: components/tracing/child/child_trace_message_filter_browsertest.cc
|
| diff --git a/components/tracing/child/child_trace_message_filter_browsertest.cc b/components/tracing/child/child_trace_message_filter_browsertest.cc
|
| index 6cfe52750099f44e1598f8cf87daa5e1fdc801c8..d6befb393cac693729a8fa862787cd51ffa4e624 100644
|
| --- a/components/tracing/child/child_trace_message_filter_browsertest.cc
|
| +++ b/components/tracing/child/child_trace_message_filter_browsertest.cc
|
| @@ -174,7 +174,13 @@ class ChildTracingTest : public content::RenderViewTest, public IPC::Listener {
|
| };
|
|
|
| // Covers the case of some browser-initiated memory dumps.
|
| -TEST_F(ChildTracingTest, BrowserInitiatedMemoryDumps) {
|
| +#if defined(OS_ANDROID)
|
| +// Flaky on Android. http://crbug.com/620734.
|
| +#define MAYBE_BrowserInitiatedMemoryDumps DISABLED_BrowserInitiatedMemoryDumps
|
| +#else
|
| +#define MAYBE_BrowserInitiatedMemoryDumps BrowserInitiatedMemoryDumps
|
| +#endif
|
| +TEST_F(ChildTracingTest, MAYBE_BrowserInitiatedMemoryDumps) {
|
| const uint32_t kNumDumps = 3;
|
|
|
| EnableTracingWithMemoryDumps();
|
|
|