Disable flaky test BidirectionalStreamDelayRequestHeadersUntilFlush/BidirectionalStreamTest.StreamF…

components/grpc_support/bidirectional_stream_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 512 matching lines @@
                                                          GetParam());
   char read_buffer[1];
   bidirectional_stream_read(test.stream, read_buffer, sizeof(read_buffer));
   test.BlockForDone();
   ASSERT_TRUE(test.read_data.empty());
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_FAILED, test.response_step);
   ASSERT_EQ(net::ERR_UNEXPECTED, test.net_error);
   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 {
       if (step == ResponseStep::ON_READ_COMPLETED) {
         // Shut down the server, and the stream should error out.
         // The second call to ShutdownQuicTestServer is no-op.
         ShutdownQuicTestServer();
       }
       return TestBidirectionalStreamCallback::MaybeCancel(stream, step);
     }
@@ skipping 103 matching lines @@
   ASSERT_EQ(TestBidirectionalStreamCallback::ON_FAILED, test.response_step);
   ASSERT_EQ(net::ERR_NAME_NOT_RESOLVED, test.net_error);
   bidirectional_stream_destroy(test.stream);
 }
 
 INSTANTIATE_TEST_CASE_P(BidirectionalStreamDelayRequestHeadersUntilFlush,
                         BidirectionalStreamTest,
                         ::testing::Values(true, false));
 
 }  // namespace grpc_support