Fix BidirectionalStreamTest#testFailures flake

components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java

 // Copyright 2015 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.
 
 package org.chromium.net;
 
 import static org.chromium.base.CollectionUtil.newHashSet;
 
 import android.os.ConditionVariable;
 import android.test.suitebuilder.annotation.SmallTest;
@@ skipping 1179 matching lines @@
         if (failureStep == ResponseStep.ON_RESPONSE_STARTED
                 || failureStep == ResponseStep.ON_READ_COMPLETED
                 || failureStep == ResponseStep.ON_TRAILERS) {
             // For steps after response headers are received, there will be
             // connect timing metrics.
             MetricsTestUtil.checkTimingMetrics(metrics, startTime, endTime);
             MetricsTestUtil.checkHasConnectTiming(metrics, startTime, endTime, true);
             assertTrue(metrics.getSentBytesCount() > 0);
             assertTrue(metrics.getReceivedBytesCount() > 0);
         } else if (failureStep == ResponseStep.ON_STREAM_READY) {
-            // onStreamReady() happens before response headers are received, so
-            // there is no connect timing metrics.
             assertNotNull(metrics.getRequestStart());
             MetricsTestUtil.assertAfter(metrics.getRequestStart(), startTime);
-            MetricsTestUtil.checkNoConnectTiming(metrics);
-            // metrics.getResponseStart() can be null or non null
-            // TODO(xunjieli): It's weird to have a null response start but a
-            // non-null response end.
             assertNotNull(metrics.getRequestEnd());
             MetricsTestUtil.assertAfter(endTime, metrics.getRequestEnd());
             // Entire request should take more than 0 ms
             assertTrue(metrics.getRequestEnd().getTime() - metrics.getRequestStart().getTime() > 0);
         }
         assertEquals(expectError, callback.mError != null);
         assertEquals(expectError, callback.mOnErrorCalled);
         assertEquals(failureType == FailureType.CANCEL_SYNC
                         || failureType == FailureType.CANCEL_ASYNC
                         || failureType == FailureType.CANCEL_ASYNC_WITHOUT_PAUSE,
                 callback.mOnCanceledCalled);
         mTestFramework.mCronetEngine.removeRequestFinishedListener(requestFinishedListener);
     }
 
-    /*
-    Disabled temporarily due to http://crbug.com/653654
-
     @SmallTest
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
-    */
-    @DisabledTest
     public void testFailures() throws Exception {
         throwOrCancel(FailureType.CANCEL_SYNC, ResponseStep.ON_STREAM_READY, false);
         throwOrCancel(FailureType.CANCEL_ASYNC, ResponseStep.ON_STREAM_READY, false);
         throwOrCancel(FailureType.CANCEL_ASYNC_WITHOUT_PAUSE, ResponseStep.ON_STREAM_READY, false);
         throwOrCancel(FailureType.THROW_SYNC, ResponseStep.ON_STREAM_READY, true);
 
         throwOrCancel(FailureType.CANCEL_SYNC, ResponseStep.ON_RESPONSE_STARTED, false);
         throwOrCancel(FailureType.CANCEL_ASYNC, ResponseStep.ON_RESPONSE_STARTED, false);
         throwOrCancel(
                 FailureType.CANCEL_ASYNC_WITHOUT_PAUSE, ResponseStep.ON_RESPONSE_STARTED, false);
@@ skipping 195 matching lines @@
     private static String bufferContentsToString(ByteBuffer byteBuffer, int start, int end) {
         // Use a duplicate to avoid modifying byteBuffer.
         ByteBuffer duplicate = byteBuffer.duplicate();
         duplicate.position(start);
         duplicate.limit(end);
         byte[] contents = new byte[duplicate.remaining()];
         duplicate.get(contents);
         return new String(contents);
     }
 }