Expose effective connection type to Cronet

components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java

Index: components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
diff --git a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
index 60ca98c96b80bf1023dfc4ca9d5228b1a8acd64e..c84373ddcf42332af7d2abc1f281042aedcb5fae 100644
--- a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
+++ b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
@@ -64,6 +64,12 @@ class CronetUrlRequestContext extends CronetEngine {
     private final Object mNetworkQualityLock = new Object();
 
     @GuardedBy("mNetworkQualityLock")
+    // Current effective connection type as computed by the network quality
+    // estimator.
+    private int mEffectiveConnectionType =
+            EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_UNKNOWN;
+
+    @GuardedBy("mNetworkQualityLock")
     private final ObserverList<NetworkQualityRttListener> mRttListenerList =
             new ObserverList<NetworkQualityRttListener>();
 
@@ -268,6 +274,17 @@ class CronetUrlRequestContext extends CronetEngine {
         mNetworkQualityExecutor = executor;
     }
 
+    @Override
+    public int getEffectiveConnectionType() {
+        if (!mNetworkQualityEstimatorEnabled) {
+            throw new IllegalStateException("Network quality estimator must be enabled");
+        }
+        synchronized (mNetworkQualityLock) {
+            checkHaveAdapter();
+            return mEffectiveConnectionType;
+        }
+    }
+
     /**
      * TODO(tbansal):  http://crbug.com/618034 Remove this API once all
      * embedders have switched to using CronetEngine builder for enabling
@@ -487,6 +504,14 @@ class CronetUrlRequestContext extends CronetEngine {
 
     @SuppressWarnings("unused")
     @CalledByNative
+    private void onEffectiveConnectionTypeChanged(int effectiveConnectionType) {
+        synchronized (mNetworkQualityLock) {
+            mEffectiveConnectionType = effectiveConnectionType;
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @CalledByNative
     private void onRttObservation(final int rttMs, final long whenMs, final int source) {
         synchronized (mNetworkQualityLock) {
             for (final NetworkQualityRttListener listener : mRttListenerList) {