[Crash Reporting] Only upload Chrome crash reports over unmetered networks.

chrome/android/java/src/org/chromium/chrome/browser/crash/ChromeMinidumpUploaderDelegate.java

 // Copyright 2017 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.chrome.browser.crash;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.PersistableBundle;
 
 import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
 import org.chromium.components.minidump_uploader.MinidumpUploaderDelegate;
 import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager;
+import org.chromium.components.minidump_uploader.util.NetworkPermissionUtil;
 
 import java.io.File;
 
 /**
  * Chrome-specific implementations for minidump uploading logic.
  */
 @TargetApi(Build.VERSION_CODES.M)
 public class ChromeMinidumpUploaderDelegate implements MinidumpUploaderDelegate {
     // PersistableBundle keys:
     static final String IS_CLIENT_IN_METRICS_SAMPLE = "isClientInMetricsSample";
@@ skipping 35 matching lines @@
     @Override
     public CrashReportingPermissionManager createCrashReportingPermissionManager() {
         return new CrashReportingPermissionManager() {
             @Override
             public boolean isClientInMetricsSample() {
                 return mPermissions.getBoolean(IS_CLIENT_IN_METRICS_SAMPLE, true);
             }
 
             @Override
             public boolean isNetworkAvailableForCrashUploads() {
-                // TODO(isherman): This code should really be shared with the Android Webview
-                // implementation, which tests whether the connection is metered, rather than
-                // testing the type of the connection. Implement this change in M59 -- for M58, it's
-                // more important to maintain consistency with the previous implementation. When
-                // changing this, note that forced uploads do *not* require unmetered connections.
-                NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo();
-                if (networkInfo == null || !networkInfo.isConnected()) return false;
-                return networkInfo.getType() == ConnectivityManager.TYPE_WIFI
-                        || networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET;
+                return NetworkPermissionUtil.isNetworkUnmetered(mConnectivityManager);
             }
 
             @Override
             public boolean isUsageAndCrashReportingPermittedByUser() {
                 return PrivacyPreferencesManager.getInstance()
                         .isUsageAndCrashReportingPermittedByUser();
             }
 
             @Override
             public boolean isUploadEnabledForTests() {
@@ skipping 10 matching lines @@
     @Override
     public void recordUploadSuccess(File minidump) {
         MinidumpUploadService.incrementCrashSuccessUploadCount(minidump.getAbsolutePath());
     }
 
     @Override
     public void recordUploadFailure(File minidump) {
         MinidumpUploadService.incrementCrashFailureUploadCount(minidump.getAbsolutePath());
     }
 }