| Index: components/grpc_support/bidirectional_stream_unittest.cc
|
| diff --git a/components/grpc_support/bidirectional_stream_unittest.cc b/components/grpc_support/bidirectional_stream_unittest.cc
|
| index 3ef83ffe9c1cf2fc7e768ebc82efc25078a10cdb..ec67198e44386c8a794acd6defb003c2f2f50c89 100644
|
| --- a/components/grpc_support/bidirectional_stream_unittest.cc
|
| +++ b/components/grpc_support/bidirectional_stream_unittest.cc
|
| @@ -530,7 +530,17 @@ TEST_P(BidirectionalStreamTest, ReadFailsBeforeRequestStarted) {
|
| bidirectional_stream_destroy(test.stream);
|
| }
|
|
|
| -TEST_P(BidirectionalStreamTest, StreamFailBeforeReadIsExecutedOnNetworkThread) {
|
| +// Flaky on Android. http://crbug.com/674128
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_StreamFailBeforeReadIsExecutedOnNetworkThread \
|
| + DISABLED_StreamFailBeforeReadIsExecutedOnNetworkThread
|
| +#else
|
| +#define MAYBE_StreamFailBeforeReadIsExecutedOnNetworkThread \
|
| + StreamFailBeforeReadIsExecutedOnNetworkThread
|
| +#endif
|
| +
|
| +TEST_P(BidirectionalStreamTest,
|
| + MAYBE_StreamFailBeforeReadIsExecutedOnNetworkThread) {
|
| class CustomTestBidirectionalStreamCallback
|
| : public TestBidirectionalStreamCallback {
|
| bool MaybeCancel(bidirectional_stream* stream, ResponseStep step) override {
|
|
|