Add default implementation of experimental methods

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.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
@@ skipping 328 matching lines @@
     public byte[] getGlobalMetricsDeltas() {
         return nativeGetHistogramDeltas();
     }
 
     @Override
     public int getEffectiveConnectionType() {
         if (!mNetworkQualityEstimatorEnabled) {
             throw new IllegalStateException("Network quality estimator must be enabled");
         }
         synchronized (mNetworkQualityLock) {
-            return mEffectiveConnectionType;
+            return convertConnectionTypeToApiValue(mEffectiveConnectionType);
         }
     }
 
     @Override
     public int getHttpRttMs() {
         if (!mNetworkQualityEstimatorEnabled) {
             throw new IllegalStateException("Network quality estimator must be enabled");
         }
         synchronized (mNetworkQualityLock) {
-            return mHttpRttMs;
+            return mHttpRttMs != RttThroughputValues.INVALID_RTT_THROUGHPUT
+                    ? mHttpRttMs
+                    : CONNECTION_METRIC_UNKNOWN;
         }
     }
 
     @Override
     public int getTransportRttMs() {
         if (!mNetworkQualityEstimatorEnabled) {
             throw new IllegalStateException("Network quality estimator must be enabled");
         }
         synchronized (mNetworkQualityLock) {
-            return mTransportRttMs;
+            return mTransportRttMs != RttThroughputValues.INVALID_RTT_THROUGHPUT
+                    ? mTransportRttMs
+                    : CONNECTION_METRIC_UNKNOWN;
         }
     }
 
     @Override
     public int getDownstreamThroughputKbps() {
         if (!mNetworkQualityEstimatorEnabled) {
             throw new IllegalStateException("Network quality estimator must be enabled");
         }
         synchronized (mNetworkQualityLock) {
-            return mDownstreamThroughputKbps;
+            return mDownstreamThroughputKbps != RttThroughputValues.INVALID_RTT_THROUGHPUT
+                    ? mDownstreamThroughputKbps
+                    : CONNECTION_METRIC_UNKNOWN;
         }
     }
 
     @VisibleForTesting
     @Override
     public void configureNetworkQualityEstimatorForTesting(
             boolean useLocalHostRequests, boolean useSmallerResponses) {
         if (!mNetworkQualityEstimatorEnabled) {
             throw new IllegalStateException("Network quality estimator must be enabled");
         }
@@ skipping 155 matching lines @@
         if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
             loggingLevel = LOG_VERBOSE;
         } else if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
             loggingLevel = LOG_DEBUG;
         } else {
             loggingLevel = LOG_NONE;
         }
         return loggingLevel;
     }
 
+    private static int convertConnectionTypeToApiValue(
+            @EffectiveConnectionType.EffectiveConnectionTypeEnum int type) {
+        switch (type) {
+            case EffectiveConnectionType.TYPE_OFFLINE:
+                return EFFECTIVE_CONNECTION_TYPE_OFFLINE;
+            case EffectiveConnectionType.TYPE_SLOW_2G:
+                return EFFECTIVE_CONNECTION_TYPE_SLOW_2G;
+            case EffectiveConnectionType.TYPE_2G:
+                return EFFECTIVE_CONNECTION_TYPE_2G;
+            case EffectiveConnectionType.TYPE_3G:
+                return EFFECTIVE_CONNECTION_TYPE_3G;
+            case EffectiveConnectionType.TYPE_4G:
+                return EFFECTIVE_CONNECTION_TYPE_4G;
+            default:
+                return EFFECTIVE_CONNECTION_TYPE_UNKNOWN;

[pauljensen, 2016/11/11 15:13:23]

can we change this to:
  case EffectiveConnectionType.TYPE_UNKNOWN:
      return EFFECTIVE_CONNECTION_TYPE_UNKNOWN;
  default:
      throw new RuntimeException("Internal Error: Illegal
EffectiveConnectionType value " + type);

[kapishnikov, 2016/11/11 16:55:22]

Good idea! Done.

+        }
+    }
+
     @SuppressWarnings("unused")
     @CalledByNative
     private void initNetworkThread() {
         mNetworkThread = Thread.currentThread();
         mInitCompleted.open();
         Thread.currentThread().setName("ChromiumNet");
         Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
     }
 
     @SuppressWarnings("unused")
@@ skipping 130 matching lines @@
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideRTTObservations(long nativePtr, boolean should);
 
     @NativeClassQualifiedName("CronetURLRequestContextAdapter")
     private native void nativeProvideThroughputObservations(long nativePtr, boolean should);
 
     public boolean isNetworkThread(Thread thread) {
         return thread == mNetworkThread;
     }
 }