Delete dead code from metrics prototype

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.InlineExecutionProhibitedException;
 import org.chromium.net.Preconditions;
 import org.chromium.net.QuicException;
@@ skipping 22 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 RequestFinishedInfo.Metrics EMPTY_METRICS =
-            new CronetMetrics(null, null, null, null);
     private final boolean mAllowDirectExecutor;
 
     /* 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")
     private boolean mWaitingOnRead = false;
     @GuardedBy("mUrlRequestAdapterLock")
-    @Nullable
-    private final UrlRequestMetricsAccumulator mRequestMetricsAccumulator;
-    @GuardedBy("mUrlRequestAdapterLock")
     private RequestFinishedInfo.Metrics mMetrics;
 
     /*
      * Synchronize access to mUrlRequestAdapter, mStarted, mWaitingOnRedirect,
      * and mWaitingOnRead.
      */
     private final Object mUrlRequestAdapterLock = new Object();
     private final CronetUrlRequestContext mRequestContext;
     private final Executor mExecutor;
 
@@ skipping 48 matching lines @@
                 }
                 mCallback.onReadCompleted(CronetUrlRequest.this, mResponseInfo, buffer);
             } catch (Exception e) {
                 onCallbackException(e);
             }
         }
     }
 
     CronetUrlRequest(CronetUrlRequestContext requestContext, String url, int priority,
             UrlRequest.Callback callback, Executor executor, Collection<Object> requestAnnotations,
-            boolean metricsCollectionEnabled, boolean disableCache,
-            boolean disableConnectionMigration, boolean allowDirectExecutor) {
+            boolean disableCache, boolean disableConnectionMigration, boolean allowDirectExecutor) {
         if (url == null) {
             throw new NullPointerException("URL is required");
         }
         if (callback == null) {
             throw new NullPointerException("Listener is required");
         }
         if (executor == null) {
             throw new NullPointerException("Executor is required");
         }
         if (requestAnnotations == null) {
             throw new NullPointerException("requestAnnotations is required");
         }
 
         mAllowDirectExecutor = allowDirectExecutor;
         mRequestContext = requestContext;
         mInitialUrl = url;
         mUrlChain.add(url);
         mPriority = convertRequestPriority(priority);
         mCallback = callback;
         mExecutor = executor;
         mRequestAnnotations = requestAnnotations;
-        mRequestMetricsAccumulator =
-                metricsCollectionEnabled ? new UrlRequestMetricsAccumulator() : null;
         mDisableCache = disableCache;
         mDisableConnectionMigration = disableConnectionMigration;
     }
 
     @Override
     public void setHttpMethod(String method) {
         checkNotStarted();
         if (method == null) {
             throw new NullPointerException("Method is required.");
         }
@@ skipping 83 matching lines @@
             startInternalLocked();
         }
     }
 
     /*
      * Starts fully configured request. Could execute on UploadDataProvider executor.
      * Caller is expected to ensure that request isn't canceled and mUrlRequestAdapter is valid.
      */
     @GuardedBy("mUrlRequestAdapterLock")
     private void startInternalLocked() {
-        if (mRequestMetricsAccumulator != null) {
-            mRequestMetricsAccumulator.onRequestStarted();
-        }
         nativeStart(mUrlRequestAdapter);
     }
 
     @Override
     public void followRedirect() {
         synchronized (mUrlRequestAdapterLock) {
             if (!mWaitingOnRedirect) {
                 throw new IllegalStateException("No redirect to follow.");
             }
             mWaitingOnRedirect = false;
@@ skipping 143 matching lines @@
                 throw new IllegalStateException("Request is already started.");
             }
         }
     }
 
     private void destroyRequestAdapter(boolean sendOnCanceled) {
         synchronized (mUrlRequestAdapterLock) {
             if (mUrlRequestAdapter == 0) {
                 return;
             }
-            if (mRequestMetricsAccumulator != null) {
-                mRequestMetricsAccumulator.onRequestFinished();
-            }
             nativeDestroy(mUrlRequestAdapter, sendOnCanceled);
             mRequestContext.onRequestDestroyed();
             mUrlRequestAdapter = 0;
             if (mOnDestroyedCallbackForTesting != null) {
                 mOnDestroyedCallbackForTesting.run();
             }
         }
     }
 
     /**
@@ skipping 106 matching lines @@
         mResponseInfo = prepareResponseInfoOnNetworkThread(httpStatusCode, httpStatusText, headers,
                 wasCached, negotiatedProtocol, proxyServer);
         Runnable task = new Runnable() {
             @Override
             public void run() {
                 checkCallingThread();
                 synchronized (mUrlRequestAdapterLock) {
                     if (isDoneLocked()) {
                         return;
                     }
-                    if (mRequestMetricsAccumulator != null) {
-                        mRequestMetricsAccumulator.onResponseStarted();
-                    }
                     mWaitingOnRead = true;
                 }
 
                 try {
                     mCallback.onResponseStarted(CronetUrlRequest.this, mResponseInfo);
                 } catch (Exception e) {
                     onCallbackException(e);
                 }
             }
         };
@@ skipping 149 matching lines @@
         }
         mRequestContext.reportFinished(getRequestFinishedInfo());
     }
 
     private RequestFinishedInfo getRequestFinishedInfo() {
         // TODO(mgersh): fill in real values for finishedReason and exception
         return new RequestFinishedInfo(mInitialUrl, mRequestAnnotations, mMetrics,
                 RequestFinishedInfo.SUCCEEDED, mResponseInfo, null);
     }
 
-    private final class UrlRequestMetricsAccumulator {
-        @Nullable
-        private Long mRequestStartTime;
-        @Nullable
-        private Long mTtfbMs;
-        @Nullable
-        private Long mTotalTimeMs;
-
-        private RequestFinishedInfo.Metrics getRequestMetrics() {
-            return new CronetMetrics(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();
-        }
-
-        private void onRequestFinished() {
-            if (mRequestStartTime != null && mTotalTimeMs == null) {
-                mTotalTimeMs = SystemClock.elapsedRealtime() - mRequestStartTime;
-            }
-        }
-
-        private void onResponseStarted() {
-            if (mRequestStartTime != null && mTtfbMs == null) {
-                mTtfbMs = SystemClock.elapsedRealtime() - mRequestStartTime;
-            }
-        }
-    }
-
     /** Enforces prohibition of direct execution. */
     void checkCallingThread() {
         if (!mAllowDirectExecutor && mRequestContext.isNetworkThread(Thread.currentThread())) {
             throw new InlineExecutionProhibitedException();
         }
     }
 
     // Native methods are implemented in cronet_url_request_adapter.cc.
 
     private native long nativeCreateRequestAdapter(long urlRequestContextAdapter, String url,
@@ skipping 15 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);
 }