| Index: mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| diff --git a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc b/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| index c95bdc3b7042c17e9a604368d73697909ba7aad4..620ab3325b05b7a4748b9130fba6046138d3e993 100644
|
| --- a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| +++ b/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| @@ -110,7 +110,13 @@ TEST_F(SharedBufferDispatcherTest, ValidateCreateOptionsInvalid) {
|
| }
|
| }
|
|
|
| -TEST_F(SharedBufferDispatcherTest, CreateAndMapBuffer) {
|
| +// https://crbug.com/667848: The test below is flaky on some Android bots.
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_CreateAndMapBuffer DISABLED_CreateAndMapBuffer
|
| +#else
|
| +#define MAYBE_CreateAndMapBuffer CreateAndMapBuffer
|
| +#endif
|
| +TEST_F(SharedBufferDispatcherTest, MAYBE_CreateAndMapBuffer) {
|
| scoped_refptr<SharedBufferDispatcher> dispatcher;
|
| EXPECT_EQ(MOJO_RESULT_OK, SharedBufferDispatcher::Create(
|
| SharedBufferDispatcher::kDefaultCreateOptions,
|
|
|