[Feedback] Add connection type data to feedback reports.

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

 // Copyright 2015 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.feedback;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.feedback.ConnectivityTask.FeedbackData;
 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;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Tests for {@link ConnectivityTask}.
  */
@@ skipping 41 matching lines @@
                     break;
                 default:
                     fail("Failed to recognize type " + result.getKey());
             }
         }
         assertTrue("The elapsed time should be non-negative.", feedback.getElapsedTimeMs() >= 0);
     }
 
     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
     @Feature({"Feedback"})
     public void testCallbackNormalCaseShouldWork() throws InterruptedException {
         final Semaphore semaphore = new Semaphore(0);
         final AtomicReference<ConnectivityTask> task = new AtomicReference<>();
         final AtomicReference<FeedbackData> feedbackRef = new AtomicReference<>();
         final ConnectivityTask.ConnectivityResult callback =
                 new ConnectivityTask.ConnectivityResult() {
@@ skipping 86 matching lines @@
 
     @SmallTest
     @Feature({"Feedback"})
     public void testFeedbackDataConversion() {
         Map<Type, Integer> connectionMap = new HashMap<>();
         connectionMap.put(Type.CHROME_HTTP, ConnectivityCheckResult.NOT_CONNECTED);
         connectionMap.put(Type.CHROME_HTTPS, ConnectivityCheckResult.CONNECTED);
         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));
         assertEquals("CONNECTED", map.get(ConnectivityTask.CHROME_HTTPS_KEY));
         assertTrue(map.containsKey(ConnectivityTask.SYSTEM_HTTP_KEY));
         assertEquals("UNKNOWN", map.get(ConnectivityTask.SYSTEM_HTTP_KEY));
         assertTrue(map.containsKey(ConnectivityTask.SYSTEM_HTTPS_KEY));
         assertEquals("CONNECTED", map.get(ConnectivityTask.SYSTEM_HTTPS_KEY));
         assertTrue(map.containsKey(ConnectivityTask.CONNECTION_CHECK_TIMEOUT_KEY));
         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) {
         final AtomicReference<FeedbackData> result = new AtomicReference<>();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 result.set(task.get().get());
             }
         });
         return result.get();
     }
 }