[Feedback] Remove connectivity check timeout from feedback reports

Currently feedback reports include a timeout for how long time they
could maximum use for gathering of data. However, since the elapsed
time is also gathered and reported, that is a better indicator for
whether there was a timeout or not. In addition, the timeout value
is constant for a given version of Chrome, so it is unnecessary to
include it in every report.

BUG=386395

Review URL: https://codereview.chromium.org/1220213002

Cr-Commit-Position: refs/heads/master@{#337421}

2 files changed, 1 insertions, 12 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityTask.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityTask.java
index 425d032..6964606 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityTask.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ConnectivityTask.java
@@ -28,14 +28,6 @@ public class ConnectivityTask {
     private static final String TAG = "cr.feedback";
 
     /**
-     * The key for the data describing the timeout that was set as a maximum for collecting
-     * the connection data. This is to better understand the connection data.
-     * This string is user visible.
-     */
-    @VisibleForTesting
-    static final String CONNECTION_CHECK_TIMEOUT_KEY = "Connection check timeout (ms)";
-
-    /**
      * The key for the data describing how long time from the connection check was started,
      * until the data was collected. This is to better understand the connection data.
      * This string is user visible.
@@ -208,7 +200,6 @@ public class ConnectivityTask {
                 map.put(getHumanReadableType(entry.getKey()),
                         getHumanReadableResult(entry.getValue()));
             }
-            map.put(CONNECTION_CHECK_TIMEOUT_KEY, String.valueOf(mTimeoutMs));
             map.put(CONNECTION_CHECK_ELAPSED_KEY, String.valueOf(mElapsedTimeMs));
             map.put(CONNECTION_TYPE_KEY, getHumanReadableConnectionType(mConnectionType));
             map.put(CONNECTION_BANDWIDTH_KEY, String.valueOf(mBandwidthInMbps));
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 bcf1fbe..2dbffda 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
@@ -188,7 +188,7 @@ public class ConnectivityTaskTest extends ConnectivityCheckerTestBase {
                 new FeedbackData(connectionMap, 42, 21, ConnectionType.CONNECTION_WIFI, 4.2);
         Map<String, String> map = feedback.toMap();
 
-        assertEquals("Should have 8 entries.", 8, map.size());
+        assertEquals("Should have 7 entries.", 7, 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));
@@ -197,8 +197,6 @@ public class ConnectivityTaskTest extends ConnectivityCheckerTestBase {
         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));