[Feedback] Add connection type data to feedback reports.

chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java
index e3da1899ed7f37ddd21042bd35252815bd2f5d68..bcf1fbe839fcfec9d3e0d8e32c0730bcaec0d16c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java
@@ -14,6 +14,7 @@ import org.chromium.chrome.browser.feedback.ConnectivityTask.Type;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
+import org.chromium.net.ConnectionType;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -75,8 +76,8 @@ public class ConnectivityTaskTest extends ConnectivityCheckerTestBase {
 
     private static void assertResult(int expectedValue, Map.Entry<Type, Integer> actualEntry) {
         assertEquals("Wrong result for " + actualEntry.getKey(),
-                ConnectivityTask.getHumanReadableString(expectedValue),
-                ConnectivityTask.getHumanReadableString(actualEntry.getValue()));
+                ConnectivityTask.getHumanReadableResult(expectedValue),
+                ConnectivityTask.getHumanReadableResult(actualEntry.getValue()));
     }
 
     @SmallTest
@@ -183,10 +184,11 @@ public class ConnectivityTaskTest extends ConnectivityCheckerTestBase {
         connectionMap.put(Type.SYSTEM_HTTP, ConnectivityCheckResult.UNKNOWN);
         connectionMap.put(Type.SYSTEM_HTTPS, ConnectivityCheckResult.CONNECTED);
 
-        FeedbackData feedback = new FeedbackData(connectionMap, 42, 21);
+        FeedbackData feedback =
+                new FeedbackData(connectionMap, 42, 21, ConnectionType.CONNECTION_WIFI, 4.2);
         Map<String, String> map = feedback.toMap();
 
-        assertEquals("Should have 6 entries.", 6, map.size());
+        assertEquals("Should have 8 entries.", 8, map.size());
         assertTrue(map.containsKey(ConnectivityTask.CHROME_HTTP_KEY));
         assertEquals("NOT_CONNECTED", map.get(ConnectivityTask.CHROME_HTTP_KEY));
         assertTrue(map.containsKey(ConnectivityTask.CHROME_HTTPS_KEY));
@@ -199,6 +201,10 @@ public class ConnectivityTaskTest extends ConnectivityCheckerTestBase {
         assertEquals("42", map.get(ConnectivityTask.CONNECTION_CHECK_TIMEOUT_KEY));
         assertTrue(map.containsKey(ConnectivityTask.CONNECTION_CHECK_ELAPSED_KEY));
         assertEquals("21", map.get(ConnectivityTask.CONNECTION_CHECK_ELAPSED_KEY));
+        assertTrue(map.containsKey(ConnectivityTask.CONNECTION_TYPE_KEY));
+        assertEquals("WiFi", map.get(ConnectivityTask.CONNECTION_TYPE_KEY));
+        assertTrue(map.containsKey(ConnectivityTask.CONNECTION_BANDWIDTH_KEY));
+        assertEquals("4.2", map.get(ConnectivityTask.CONNECTION_BANDWIDTH_KEY));
     }
 
     private static FeedbackData getResult(final AtomicReference<ConnectivityTask> task) {