Move Cronet metrics-related classes into their own files

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

 // Copyright 2014 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.impl;
 
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import android.util.Log;
 
 import org.chromium.base.VisibleForTesting;
 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;
 import org.chromium.net.UrlRequestException;
 import org.chromium.net.UrlResponseInfo;
 
 import java.nio.ByteBuffer;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collection;
@@ skipping 11 matching lines @@
  * and post tasks with listener calls onto Executor. Upon return from listener
  * callback native request adapter is called on executive thread and posts
  * native tasks to native network thread. Because Cancel could be called from
  * any thread it is protected by mUrlRequestAdapterLock.
  */
 @JNINamespace("cronet")
 // Qualifies UrlRequest.StatusListener which is used in onStatus, a JNI method.
 @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")
     private long mUrlRequestAdapter;
 
     @GuardedBy("mUrlRequestAdapterLock")
     private boolean mStarted = false;
     @GuardedBy("mUrlRequestAdapterLock")
     private boolean mWaitingOnRedirect = false;
     @GuardedBy("mUrlRequestAdapterLock")
@@ skipping 626 matching lines @@
     private void onStatus(final UrlRequest.StatusListener listener, final int loadState) {
         Runnable task = new Runnable() {
             @Override
             public void run() {
                 listener.onStatus(UrlRequest.Status.convertLoadState(loadState));
             }
         };
         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.

     }
 
     private final class UrlRequestMetricsAccumulator {
         @Nullable
         private Long mRequestStartTime;
         @Nullable
         private Long mTtfbMs;
         @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));
         }
 
         private void onRequestStarted() {
             if (mRequestStartTime != null) {
                 throw new IllegalStateException("onRequestStarted called repeatedly");
             }
             mRequestStartTime = SystemClock.elapsedRealtime();
         }
@@ skipping 31 matching lines @@
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native boolean nativeReadData(
             long nativePtr, ByteBuffer byteBuffer, int position, int capacity);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native void nativeDestroy(long nativePtr, boolean sendOnCanceled);
 
     @NativeClassQualifiedName("CronetURLRequestAdapter")
     private native void nativeGetStatus(long nativePtr, UrlRequest.StatusListener listener);
 }