[Cronet] Pass metrics information from C++ BidirectionalStream to Java

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java
index 064ead0d2608e04eede130ebf8b0123b3463273e..5d882d5cbcd3f0cad183eed36b5d270c98ad1756 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java
@@ -12,7 +12,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
-import org.chromium.net.MetricsTestUtil.TestExecutor;
 import org.chromium.net.MetricsTestUtil.TestRequestFinishedListener;
 import org.chromium.net.TestBidirectionalStreamCallback.FailureType;
 import org.chromium.net.TestBidirectionalStreamCallback.ResponseStep;
@@ -227,9 +226,7 @@ public class BidirectionalStreamTest extends CronetTestBase {
         callback.addWriteData("Test String".getBytes());
         callback.addWriteData("1234567890".getBytes());
         callback.addWriteData("woot!".getBytes());
-        TestExecutor testExecutor = new TestExecutor();
-        TestRequestFinishedListener requestFinishedListener =
-                new TestRequestFinishedListener(testExecutor);
+        TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener(1);

[mgersh, 2016/10/05 19:36:47]

I think this is the only place that does new TestRequestFinishedListener(int),
and it does the same thing that it would do without the int argument. You can
change this one, and then delete the extra constructor from
TestRequestFinishedListener.

[xunjieli, 2016/10/06 03:51:47]

Done.

         mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
         // Create stream.
         BidirectionalStream stream = new BidirectionalStream
@@ -243,8 +240,8 @@ public class BidirectionalStreamTest extends CronetTestBase {
                                              .build();
         stream.start();
         callback.blockForDone();
-        testExecutor.runAllTasks();
         assertTrue(stream.isDone());
+        requestFinishedListener.blockUntilDone();
         RequestFinishedInfo finishedInfo = requestFinishedListener.getRequestInfo();
         assertNotNull("RequestFinishedInfo.Listener must be called", finishedInfo);
         assertEquals(url, finishedInfo.getUrl());