Move Cronet metrics-related classes into their own files

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedListenerTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedListenerTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedListenerTest.java
index 53e1850f2770b601a0fc90985056c60d3f2cd2be..e79a3d78ca5b96060efeb698266dd245827e48ce 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedListenerTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/RequestFinishedListenerTest.java
@@ -9,7 +9,6 @@ import static org.chromium.base.CollectionUtil.newHashSet;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
-import org.chromium.net.CronetEngine.UrlRequestInfo;
 import org.chromium.net.test.EmbeddedTestServer;
 
 import java.util.ArrayList;
@@ -84,14 +83,14 @@ public class RequestFinishedListenerTest extends CronetTestBase {
     }
 
     private static class TestRequestFinishedListener extends RequestFinishedListener {
-        private UrlRequestInfo mRequestInfo;
+        private RequestFinishedInfo mRequestInfo;
 
         public TestRequestFinishedListener(Executor executor) {
             super(executor);
         }
 
         @Override
-        public void onRequestFinished(UrlRequestInfo requestInfo) {
+        public void onRequestFinished(RequestFinishedInfo requestInfo) {
             assertNull("onRequestFinished called repeatedly", mRequestInfo);
             assertNotNull(requestInfo);
             mRequestInfo = requestInfo;
@@ -117,14 +116,14 @@ public class RequestFinishedListenerTest extends CronetTestBase {
         callback.blockForDone();
         testExecutor.runAllTasks();
 
-        CronetEngine.UrlRequestInfo requestInfo = requestFinishedListener.mRequestInfo;
+        RequestFinishedInfo requestInfo = requestFinishedListener.mRequestInfo;
         assertNotNull("RequestFinishedListener must be called", requestInfo);
         assertEquals(mUrl, requestInfo.getUrl());
         assertNotNull(requestInfo.getResponseInfo());
         assertEquals(newHashSet("request annotation", this), // Use sets for unordered comparison.
                 new HashSet<Object>(requestInfo.getAnnotations()));
-        CronetEngine.UrlRequestMetrics metrics = requestInfo.getMetrics();
-        assertNotNull("UrlRequestInfo.getMetrics() must not be null", metrics);
+        UrlRequestMetrics metrics = requestInfo.getMetrics();
+        assertNotNull("RequestFinishedInfo.getMetrics() must not be null", metrics);
         assertTrue(metrics.getTotalTimeMs() > 0);
         assertTrue(metrics.getTotalTimeMs() >= metrics.getTtfbMs());
         assertTrue(metrics.getReceivedBytesCount() > 0);
@@ -149,14 +148,14 @@ public class RequestFinishedListenerTest extends CronetTestBase {
                 .start();
         callback.blockForDone();
 
-        CronetEngine.UrlRequestInfo requestInfo = requestFinishedListener.mRequestInfo;
+        RequestFinishedInfo requestInfo = requestFinishedListener.mRequestInfo;
         assertNotNull("RequestFinishedListener must be called", requestInfo);
         assertEquals(mUrl, requestInfo.getUrl());
         assertNotNull(requestInfo.getResponseInfo());
         assertEquals(newHashSet("request annotation", this), // Use sets for unordered comparison.
                 new HashSet<Object>(requestInfo.getAnnotations()));
-        CronetEngine.UrlRequestMetrics metrics = requestInfo.getMetrics();
-        assertNotNull("UrlRequestInfo.getMetrics() must not be null", metrics);
+        UrlRequestMetrics metrics = requestInfo.getMetrics();
+        assertNotNull("RequestFinishedInfo.getMetrics() must not be null", metrics);
         assertTrue(metrics.getTotalTimeMs() > 0);
         assertTrue(metrics.getTotalTimeMs() >= metrics.getTtfbMs());
         assertTrue(metrics.getReceivedBytesCount() > 0);
@@ -183,8 +182,8 @@ public class RequestFinishedListenerTest extends CronetTestBase {
         callback.blockForDone();
         testExecutor.joinAll();
 
-        CronetEngine.UrlRequestInfo firstRequestInfo = firstListener.mRequestInfo;
-        CronetEngine.UrlRequestInfo secondRequestInfo = secondListener.mRequestInfo;
+        RequestFinishedInfo firstRequestInfo = firstListener.mRequestInfo;
+        RequestFinishedInfo secondRequestInfo = secondListener.mRequestInfo;
         assertNotNull("First RequestFinishedListener must be called", firstRequestInfo);
         assertNotNull("Second RequestFinishedListener must be called", secondRequestInfo);
         assertEquals(mUrl, firstRequestInfo.getUrl());
@@ -195,13 +194,13 @@ public class RequestFinishedListenerTest extends CronetTestBase {
                 new HashSet<Object>(firstRequestInfo.getAnnotations()));
         assertEquals(newHashSet("request annotation", this),
                 new HashSet<Object>(secondRequestInfo.getAnnotations()));
-        CronetEngine.UrlRequestMetrics firstMetrics = firstRequestInfo.getMetrics();
-        assertNotNull("UrlRequestInfo.getMetrics() must not be null", firstMetrics);
+        UrlRequestMetrics firstMetrics = firstRequestInfo.getMetrics();
+        assertNotNull("RequestFinishedInfo.getMetrics() must not be null", firstMetrics);
         assertTrue(firstMetrics.getTotalTimeMs() > 0);
         assertTrue(firstMetrics.getTotalTimeMs() >= firstMetrics.getTtfbMs());
         assertTrue(firstMetrics.getReceivedBytesCount() > 0);
-        CronetEngine.UrlRequestMetrics secondMetrics = secondRequestInfo.getMetrics();
-        assertNotNull("UrlRequestInfo.getMetrics() must not be null", secondMetrics);
+        UrlRequestMetrics secondMetrics = secondRequestInfo.getMetrics();
+        assertNotNull("RequestFinishedInfo.getMetrics() must not be null", secondMetrics);
         assertTrue(secondMetrics.getTotalTimeMs() > 0);
         assertTrue(secondMetrics.getTotalTimeMs() >= secondMetrics.getTtfbMs());
         assertTrue(secondMetrics.getReceivedBytesCount() > 0);
@@ -226,12 +225,12 @@ public class RequestFinishedListenerTest extends CronetTestBase {
         assertTrue(callback.mOnErrorCalled);
         testExecutor.runAllTasks();
 
-        CronetEngine.UrlRequestInfo requestInfo = requestFinishedListener.mRequestInfo;
+        RequestFinishedInfo requestInfo = requestFinishedListener.mRequestInfo;
         assertNotNull("RequestFinishedListener must be called", requestInfo);
         assertEquals(connectionRefusedUrl, requestInfo.getUrl());
         assertTrue(requestInfo.getAnnotations().isEmpty());
-        CronetEngine.UrlRequestMetrics metrics = requestInfo.getMetrics();
-        assertNotNull("UrlRequestInfo.getMetrics() must not be null", metrics);
+        UrlRequestMetrics metrics = requestInfo.getMetrics();
+        assertNotNull("RequestFinishedInfo.getMetrics() must not be null", metrics);
         // The failure is occasionally fast enough that time reported is 0, so just check for null
         assertNotNull(metrics.getTotalTimeMs());
         assertNull(metrics.getTtfbMs());