Move Cronet metrics-related classes into their own files

components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java

Index: components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java
diff --git a/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java b/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java
index da4cc00a797b36addc322d91477475ece9566148..00e3a2065acf4e221a248dde2005a704344c1d11 100644
--- a/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java
+++ b/components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java
@@ -13,10 +13,9 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNIAdditionalImport;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeClassQualifiedName;
-import org.chromium.net.CronetEngine.UrlRequestInfo;
-import org.chromium.net.CronetEngine.UrlRequestMetrics;
 import org.chromium.net.Preconditions;
 import org.chromium.net.QuicException;
+import org.chromium.net.RequestFinishedInfo;
 import org.chromium.net.RequestPriority;
 import org.chromium.net.UploadDataProvider;
 import org.chromium.net.UrlRequest;
@@ -48,8 +47,8 @@ import javax.annotation.concurrent.GuardedBy;
 @JNIAdditionalImport(UrlRequest.class)
 @VisibleForTesting
 public final class CronetUrlRequest implements UrlRequest {
-    private static final UrlRequestMetrics EMPTY_METRICS =
-            new UrlRequestMetrics(null, null, null, null);
+    private static final RequestFinishedInfo.Metrics EMPTY_METRICS =
+            new RequestFinishedInfo.Metrics(null, null, null, null);
 
     /* Native adapter object, owned by UrlRequest. */
     @GuardedBy("mUrlRequestAdapterLock")
@@ -696,8 +695,8 @@ public final class CronetUrlRequest implements UrlRequest {
         postTaskToExecutor(task);
     }
 
-    UrlRequestInfo getRequestInfo() {
-        return new UrlRequestInfo(mInitialUrl, mRequestAnnotations,
+    RequestFinishedInfo getRequestInfo() {

[xunjieli, 2016/08/01 22:14:11]

getRequestInfo() -> getRequestFinishedInfo()?

[mgersh, 2016/08/01 22:33:45]

Done.

+        return new RequestFinishedInfo(mInitialUrl, mRequestAnnotations,
                 (mRequestMetricsAccumulator != null ? mRequestMetricsAccumulator.getRequestMetrics()
                                                     : EMPTY_METRICS),
                 mResponseInfo);

[xunjieli, 2016/08/01 22:14:11]

not in this CL, but why do we make the RequestFinishedInfo have a reference to
mResponseInfo? Shouldn't they be separate?

[mgersh, 2016/08/01 22:33:45]

It makes it easy to access the information in UrlResponseInfo from inside a
RequestFinishedInfo.Listener callback. Without it, the embedder would get both
pieces of information but they would be in separate places and harder to link
and process together. All the embedders that currently use
RequestFinishedListener use this.

[xunjieli, 2016/08/01 22:42:48]

Acknowledged. You are right. I missed the fact that this is obtained on the
CronetEngine level, and consumer doesn't know the UrlRequest that this info is
attached to.

@@ -711,8 +710,8 @@ public final class CronetUrlRequest implements UrlRequest {
         @Nullable
         private Long mTotalTimeMs;
 
-        private UrlRequestMetrics getRequestMetrics() {
-            return new UrlRequestMetrics(mTtfbMs, mTotalTimeMs,
+        private RequestFinishedInfo.Metrics getRequestMetrics() {
+            return new RequestFinishedInfo.Metrics(mTtfbMs, mTotalTimeMs,
                     null, // TODO(klm): Compute sentBytesCount.
                     (mResponseInfo != null ? mResponseInfo.getReceivedBytesCount() : 0));
         }