Revert histograms for crbug.com/677365 as they're no longer needed.

net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java

 // Copyright 2012 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 static android.net.ConnectivityManager.TYPE_VPN;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;
 import static android.net.NetworkCapabilities.TRANSPORT_VPN;
@@ skipping 68 matching lines @@
         }
 
         // WiFi SSID, always non-null to facilitate .equals()
         public String getWifiSsid() {
             return mWifiSsid;
         }
     }
 
     /** Queries the ConnectivityManager for information about the current connection. */
     static class ConnectivityManagerDelegate {
-        private static final int NETWORK_INFO_DISCONNECTED = 0;
-        private static final int NETWORK_INFO_CONNECTED = 1;
-        private static final int NETWORK_INFO_ANDROID_API_LEVEL_TOO_OLD_FOR_UNBLOCKING = 2;
-        private static final int NETWORK_INFO_NOT_BLOCKED = 3;
-        private static final int NETWORK_INFO_APP_NOT_IN_FOREGROUND = 4;
-        private static final int NETWORK_INFO_UNBLOCKED = 5;
-        private static final int NETWORK_INFO_BOUNDARY = 6;
-
         private final ConnectivityManager mConnectivityManager;
 
         ConnectivityManagerDelegate(Context context) {
             mConnectivityManager =
                     (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         }
 
         // For testing.
         ConnectivityManagerDelegate() {
             // All the methods below should be overridden.
             mConnectivityManager = null;
         }
 
         /**
          * @return the info of the network that is available to this app.
          */
         @TargetApi(Build.VERSION_CODES.LOLLIPOP)
         private NetworkInfo getActiveNetworkInfo() {
             final NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo();
             if (networkInfo == null) {
-                recordGetActiveNetworkInfoResult(NETWORK_INFO_DISCONNECTED);
                 return null;
             }
 
             if (networkInfo.isConnected()) {
-                recordGetActiveNetworkInfoResult(NETWORK_INFO_CONNECTED);
                 return networkInfo;
             }
 
             // If |networkInfo| is BLOCKED, but the app is in the foreground, then it's likely that
             // Android hasn't finished updating the network access permissions as BLOCKED is only
             // meant for apps in the background.  See https://crbug.com/677365 for more details.
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
                 // https://crbug.com/677365 primarily affects only Lollipop and higher versions.
-                recordGetActiveNetworkInfoResult(
-                        NETWORK_INFO_ANDROID_API_LEVEL_TOO_OLD_FOR_UNBLOCKING);
                 return null;
             }
 
             if (networkInfo.getDetailedState() != NetworkInfo.DetailedState.BLOCKED) {
                 // Network state is not blocked which implies that network access is
                 // unavailable (not just blocked to this app).
-                recordGetActiveNetworkInfoResult(NETWORK_INFO_NOT_BLOCKED);
                 return null;
             }
 
             if (ApplicationStatus.getStateForApplication()
                     != ApplicationState.HAS_RUNNING_ACTIVITIES) {
                 // The app is not in the foreground.
-                recordGetActiveNetworkInfoResult(NETWORK_INFO_APP_NOT_IN_FOREGROUND);
                 return null;
             }
-            recordGetActiveNetworkInfoResult(NETWORK_INFO_UNBLOCKED);
             return networkInfo;
         }
 
         /**
-         * Records the result of querying the network info of the current active network.
-         * @param result Result of querying the network info of the current active network.
-         */
-        private static void recordGetActiveNetworkInfoResult(int result) {
-            assert result >= 0 && result < NETWORK_INFO_BOUNDARY;
-            RecordHistogram.recordEnumeratedHistogram(
-                    "NCN.GetActiveNetworkInfoResult", result, NETWORK_INFO_BOUNDARY);
-        }
-
-        /**
          * Returns connection type and status information about the current
          * default network.
          */
         NetworkState getNetworkState(WifiManagerDelegate wifiManagerDelegate) {
             final NetworkInfo networkInfo = getActiveNetworkInfo();
             if (networkInfo == null) {
                 return new NetworkState(false, -1, -1, null);
             }
             // If Wifi, then fetch SSID also
             if (networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
@@ skipping 913 matching lines @@
             return network.getNetworkHandle();
         } else {
             // NOTE(pauljensen): This depends on Android framework implementation details. These
             // details cannot change because Lollipop is long since released.
             // NetIDs are only 16-bit so use parseInt. This function returns a long because
             // getNetworkHandle() returns a long.
             return Integer.parseInt(network.toString());
         }
     }
 }