diff --git a/google_apis/gcm/engine/connection_handler_impl_unittest.cc b/google_apis/gcm/engine/connection_handler_impl_unittest.cc index 8da8b854ad666a..d047f271d308b9 100644 --- a/google_apis/gcm/engine/connection_handler_impl_unittest.cc +++ b/google_apis/gcm/engine/connection_handler_impl_unittest.cc @@ -17,6 +17,7 @@ #include "base/test/bind_test_util.h" #include "base/test/scoped_task_environment.h" #include "base/test/test_timeouts.h" +#include "build/build_config.h" #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" #include "google/protobuf/wire_format_lite.h" @@ -432,7 +433,13 @@ TEST_F(GCMConnectionHandlerImplTest, ReInit) { } // Verify that messages can be received after initialization. -TEST_F(GCMConnectionHandlerImplTest, RecvMsg) { +// Flaky on Linux (crbug.com/906093) +#if defined(OS_LINUX) +#define MAYBE_RecvMsg DISABLED_RecvMsg +#else +#define MAYBE_RecvMsg RecvMsg +#endif +TEST_F(GCMConnectionHandlerImplTest, MAYBE_RecvMsg) { std::string handshake_request = EncodeHandshakeRequest(); WriteList write_list(1, net::MockWrite(net::ASYNC, handshake_request.c_str(),