Delete old NetworkQualityEstimator Cronet API

components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.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.content.Context;
 import android.os.Build;
 import android.os.ConditionVariable;
 import android.os.Handler;
@@ skipping 45 matching lines @@
     /**
      * Synchronize access to mUrlRequestContextAdapter and shutdown routine.
      */
     private final Object mLock = new Object();
     private final ConditionVariable mInitCompleted = new ConditionVariable(false);
     private final AtomicInteger mActiveRequestCount = new AtomicInteger(0);
 
     private long mUrlRequestContextAdapter = 0;
     private Thread mNetworkThread;
 
-    private Executor mNetworkQualityExecutor;
     private boolean mNetworkQualityEstimatorEnabled;
 
     /**
      * Locks operations on network quality listeners, because listener
      * addition and removal may occur on a different thread from notification.
      */
     private final Object mNetworkQualityLock = new Object();
 
     /**
      * Locks operations on the list of RequestFinishedListeners, because operations can happen on
@@ skipping 177 matching lines @@
         return mCertVerifierData;
     }
 
     // This method is intentionally non-static to ensure Cronet native library
     // is loaded by class constructor.
     @Override
     public byte[] getGlobalMetricsDeltas() {
         return nativeGetHistogramDeltas();
     }
 
-    /**
-     * TODO(tbansal):  http://crbug.com/618034 Remove this API once all
-     * embedders have switched to using a request finished listener that
-     * provides its own executor.
-     */
-    @Override
-    public void setRequestFinishedListenerExecutor(Executor executor) {
-        if (!mNetworkQualityEstimatorEnabled) {
-            throw new IllegalStateException("Network quality estimator not enabled");
-        }
-        if (executor == null) {
-            throw new NullPointerException("Request finished listener requires an executor");
-        }
-        if (mNetworkQualityExecutor != null) {
-            throw new NullPointerException("Request finished listener executor already set");
-        }
-        mNetworkQualityExecutor = executor;
-    }
-
-    /**
-     * TODO(tbansal):  http://crbug.com/618034 Remove this API once all
-     * embedders have switched to using CronetEngine builder for enabling
-     * network quality estimator.
-     */
-    @Override
-    public void enableNetworkQualityEstimator(Executor executor) {
-        if (mNetworkQualityEstimatorEnabled) {
-            throw new IllegalStateException("Network quality estimator already enabled");
-        }
-        mNetworkQualityEstimatorEnabled = true;
-        if (executor == null) {
-            throw new NullPointerException("Network quality estimator requires an executor");
-        }
-        mNetworkQualityExecutor = executor;
-        synchronized (mLock) {
-            checkHaveAdapter();
-            nativeEnableNetworkQualityEstimator(mUrlRequestContextAdapter);
-        }
-    }
-
     @VisibleForTesting
     @Override
     public void configureNetworkQualityEstimatorForTesting(
             boolean useLocalHostRequests, boolean useSmallerResponses) {
         if (!mNetworkQualityEstimatorEnabled) {
             throw new IllegalStateException("Network quality estimator must be enabled");
         }
         synchronized (mLock) {
             checkHaveAdapter();
             nativeConfigureNetworkQualityEstimatorForTesting(
@@ skipping 58 matching lines @@
             mThroughputListenerList.removeObserver(listener);
             if (mThroughputListenerList.isEmpty()) {
                 synchronized (mLock) {
                     checkHaveAdapter();
                     nativeProvideThroughputObservations(mUrlRequestContextAdapter, false);
                 }
             }
         }
     }
 
-    /**
-     * TODO(tbansal):  http://crbug.com/618034 Remove this API once all
-     * embedders have switched to using a request finished listener that
-     * provides its own executor.
-     */
     @Override
     public void addRequestFinishedListener(RequestFinishedListener listener) {
         synchronized (mFinishedListenerLock) {
             mFinishedListenerList.add(listener);
         }
     }
 
-    /**
-     * TODO(tbansal):  http://crbug.com/618034 Remove this API.
-     */
     @Override
     public void removeRequestFinishedListener(RequestFinishedListener listener) {
         synchronized (mFinishedListenerLock) {
             mFinishedListenerList.remove(listener);
         }
     }
 
     @Override
     public URLConnection openConnection(URL url) {
         return openConnection(url, Proxy.NO_PROXY);
@@ skipping 178 matching lines @@
     private native void nativeGetCertVerifierData(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeInitRequestContextOnMainThread(long nativePtr);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeConfigureNetworkQualityEstimatorForTesting(
             long nativePtr, boolean useLocalHostRequests, boolean useSmallerResponses);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
-    private native void nativeEnableNetworkQualityEstimator(long nativePtr);
-
-    @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideRTTObservations(long nativePtr, boolean should);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideThroughputObservations(long nativePtr, boolean should);
 }