Expose effective connection type to Cronet

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.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;
 
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.os.ConditionVariable;
 import android.os.Handler;
@@ skipping 308 matching lines @@
         // NETWORK_QUALITY_OBSERVATION_SOURCE_TCP
         assertTrue(rttListener.rttObservationCount(1) > 0);
 
         // NETWORK_QUALITY_OBSERVATION_SOURCE_QUIC
         assertEquals(0, rttListener.rttObservationCount(2));
 
         // Verify that the listeners were notified on the expected thread.
         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
     @Feature({"Cronet"})
     https://crbug.com/596929
     */
     @FlakyTest
     public void testShutdown() throws Exception {
         mTestFramework = startCronetTestFramework();
         TestUrlRequestCallback callback = new ShutdownTestUrlRequestCallback();
@@ skipping 770 matching lines @@
                     }
                 }.start();
                 otherThreadDone.block();
                 builder.build().shutdown();
                 uiThreadDone.open();
             }
         });
         assertTrue(uiThreadDone.block(1000));
     }
 }