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

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
index b3dbbc4514faf0343ec14d92f717f4f078252868..93ef668af8f1c68a12835f647c6b745be3e6f2ee 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java
@@ -10,7 +10,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 
 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;

[xunjieli, 2016/10/05 19:00:28]

Any idea on why presubmit script gives the following warning?

" 
components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java:14:
Wrong order for org.json.JSONObject import. Use :JavaImportOrganize (ECLIM) or
Ctrl+Shift+O (Eclipse) to sort imports. An importorder file for configuring
Eclipse can be found at //tools/android/eclipse/android.importorder."

I thought the order is correct...

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

I think this must have been a recent change to the presubmit, because I ran into
the same thing. I tried a bunch of places and the one that eventually made the
warning go away was putting it after android imports but before org.chromium
imports.

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

Done. That's good to know. Thanks!

 import org.json.JSONObject;
 
@@ -94,9 +93,7 @@ public class BidirectionalStreamQuicTest 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();
         mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);
         BidirectionalStream stream = new BidirectionalStream
                                              .Builder(quicURL, callback, callback.getExecutor(),
@@ -109,8 +106,8 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {
                                              .build();
         stream.start();
         callback.blockForDone();
-        testExecutor.runAllTasks();
         assertTrue(stream.isDone());
+        requestFinishedListener.blockUntilDone();

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

Can we also do some checks on the timing metrics here?

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

Done.

         RequestFinishedInfo finishedInfo = requestFinishedListener.getRequestInfo();
         assertNotNull("RequestFinishedInfo.Listener must be called", finishedInfo);
         assertEquals(quicURL, finishedInfo.getUrl());