Expose effective connection type to Cronet

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

Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
index 8330c3fa33cd5d5d34471d740e1584496e1b7fdb..3bc69e94ab347227cdcf3e521f981da8fea090ec 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
@@ -326,10 +326,42 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
         assertEquals(mNetworkQualityThread, rttListener.getThread());
         assertEquals(mNetworkQualityThread, throughputListener.getThread());
 
+        // Verify that effective connection type callback is received and
+        // effective connection type is correctly set.
+        assertTrue(mTestFramework.mCronetEngine.getEffectiveConnectionType()
+                != EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_UNKNOWN);
+
         mTestFramework.mCronetEngine.shutdown();
     }
 
-
+    @SmallTest
+    @Feature({"Cronet"})
+    public void testEffectiveConnectionTypeEquivalence() throws Exception {
+        assertEquals(EffectiveConnectionType.getEffectiveConnectionType(
+                             NetworkEffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_UNKNOWN),
+                EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_UNKNOWN);
+        assertEquals(EffectiveConnectionType.getEffectiveConnectionType(
+                             NetworkEffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_OFFLINE),
+                EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_OFFLINE);
+        assertEquals(EffectiveConnectionType.getEffectiveConnectionType(
+                             NetworkEffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_SLOW_2G),
+                EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_SLOW_2G);
+        assertEquals(EffectiveConnectionType.getEffectiveConnectionType(
+                             NetworkEffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_2G),
+                EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_2G);
+        assertEquals(EffectiveConnectionType.getEffectiveConnectionType(
+                             NetworkEffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_3G),
+                EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_3G);
+        assertEquals(EffectiveConnectionType.getEffectiveConnectionType(
+                             NetworkEffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_4G),
+                EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_4G);
+        assertEquals(EffectiveConnectionType.getEffectiveConnectionType(
+                             NetworkEffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_BROADBAND),
+                EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_BROADBAND);
+        assertEquals(EffectiveConnectionType.getEffectiveConnectionType(
+                             NetworkEffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_LAST),
+                EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_LAST);
+    }
 
     /**
     @SmallTest