[minidump uploader] Retries: only initiate uploads when on WiFi/Ethernet

chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
index 87103c9c8f13f1a52c118ceea0723e4c5379de13..6ce717b3a7d97c77e1b8e4fb3946bceade95961a 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceTest.java
@@ -22,6 +22,7 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.components.minidump_uploader.CrashFileManager;
 import org.chromium.components.minidump_uploader.CrashTestCase;
 import org.chromium.components.minidump_uploader.MinidumpUploadCallable;
+import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.net.NetworkChangeNotifier;
@@ -79,6 +80,8 @@ public class MinidumpUploadServiceTest extends CrashTestCase {
     }
 
     private static class TestMinidumpUploadService extends MinidumpUploadService {
+        private NetworkChangingPermissionManager mPermissionManager =

[Maria, 2017/01/03 19:28:41]

final

[gsennton, 2017/01/03 20:00:35]

Done.

+                new NetworkChangingPermissionManager();
         private TestMinidumpUploadService() {}
         private TestMinidumpUploadService(Context context) {
             attachBaseContext(context);
@@ -87,6 +90,25 @@ public class MinidumpUploadServiceTest extends CrashTestCase {
         private void attachBaseContextLate(Context base) {
             super.attachBaseContext(base);
         }
+
+        private static class NetworkChangingPermissionManager
+                extends MockCrashReportingPermissionManager {
+            public boolean isNetworkAvailableForCrashUploads() {
+                return mIsNetworkAvailable;
+            }
+
+            public void setIsNetworkAvailableForCrashUploads(boolean networkAvailable) {
+                mIsNetworkAvailable = networkAvailable;
+            }
+        }
+
+        CrashReportingPermissionManager getCrashReportingPermissionManager() {
+            return mPermissionManager;
+        }
+
+        public void setIsNetworkAvailableForCrashUploads(boolean networkAvailable) {
+            mPermissionManager.setIsNetworkAvailableForCrashUploads(networkAvailable);
+        }
     }
 
     @SmallTest
@@ -270,7 +292,9 @@ public class MinidumpUploadServiceTest extends CrashTestCase {
                                 NetworkChangeNotifier.setAutoDetectConnectivityState(false);
                                 // Quickly force the state to be connected and back to disconnected.
                                 // An event should be triggered for retry logics.
+                                setIsNetworkAvailableForCrashUploads(false);
                                 NetworkChangeNotifier.forceConnectivityState(false);
+                                setIsNetworkAvailableForCrashUploads(true);
                                 NetworkChangeNotifier.forceConnectivityState(true);
                             }
                         });