Revert of Expose effective connection type to Cronet

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;
 import android.os.Looper;
 import android.os.Process;
 import android.util.Log;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeClassQualifiedName;
 import org.chromium.base.annotations.UsedByReflection;
 import org.chromium.net.BidirectionalStream;
 import org.chromium.net.CronetEngine;
-import org.chromium.net.EffectiveConnectionType;
 import org.chromium.net.NetworkQualityRttListener;
 import org.chromium.net.NetworkQualityThroughputListener;
 import org.chromium.net.RequestFinishedInfo;
 import org.chromium.net.UrlRequest;
 import org.chromium.net.urlconnection.CronetHttpURLConnection;
 import org.chromium.net.urlconnection.CronetURLStreamHandlerFactory;
 
 import java.net.Proxy;
 import java.net.URL;
 import java.net.URLConnection;
@@ skipping 37 matching lines @@
      * addition and removal may occur on a different thread from notification.
      */
     private final Object mNetworkQualityLock = new Object();
 
     /**
      * Locks operations on the list of RequestFinishedInfo.Listeners, because operations can happen
      * on any thread.
      */
     private final Object mFinishedListenerLock = new Object();
 
-    /**
-     * Current effective connection type as computed by the network quality
-     * estimator.
-     */
-    @GuardedBy("mNetworkQualityLock")
-    private int mEffectiveConnectionType =
-            EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_UNKNOWN;
-
     @GuardedBy("mNetworkQualityLock")
     private final ObserverList<NetworkQualityRttListener> mRttListenerList =
             new ObserverList<NetworkQualityRttListener>();
 
     @GuardedBy("mNetworkQualityLock")
     private final ObserverList<NetworkQualityThroughputListener> mThroughputListenerList =
             new ObserverList<NetworkQualityThroughputListener>();
 
     @GuardedBy("mFinishedListenerLock")
     private final List<RequestFinishedInfo.Listener> mFinishedListenerList =
@@ skipping 163 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();
     }
 
-    @Override
-    public int getEffectiveConnectionType() {
-        if (!mNetworkQualityEstimatorEnabled) {
-            throw new IllegalStateException("Network quality estimator must be enabled");
-        }
-        synchronized (mNetworkQualityLock) {
-            checkHaveAdapter();
-            return mEffectiveConnectionType;
-        }
-    }
-
     @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 156 matching lines @@
     private void initNetworkThread() {
         synchronized (mLock) {
             mNetworkThread = Thread.currentThread();
             mInitCompleted.open();
         }
         Thread.currentThread().setName("ChromiumNet");
         Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
     }
 
     @SuppressWarnings("unused")
-    @CalledByNative
-    private void onEffectiveConnectionTypeChanged(int effectiveConnectionType) {
-        synchronized (mNetworkQualityLock) {
-            // Convert the enum returned by the network quality estimator to an enum of type
-            // EffectiveConnectionType.
-            mEffectiveConnectionType =
-                    EffectiveConnectionType.getEffectiveConnectionType(effectiveConnectionType);
-        }
-    }
-
-    @SuppressWarnings("unused")
     @CalledByNative
     private void onRttObservation(final int rttMs, final long whenMs, final int source) {
         synchronized (mNetworkQualityLock) {
             for (final NetworkQualityRttListener listener : mRttListenerList) {
                 Runnable task = new Runnable() {
                     @Override
                     public void run() {
                         listener.onRttObservation(rttMs, whenMs, source);
                     }
                 };
@@ skipping 92 matching lines @@
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeConfigureNetworkQualityEstimatorForTesting(
             long nativePtr, boolean useLocalHostRequests, boolean useSmallerResponses);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideRTTObservations(long nativePtr, boolean should);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideThroughputObservations(long nativePtr, boolean should);
 }