Fix overflow in user traffic content type histogram

components/data_use_measurement/core/data_use_measurement_unittest.cc

 // 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.
 
 #include "components/data_use_measurement/core/data_use_measurement.h"
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
@@ skipping 428 matching lines @@
       "DataUse.AppTabState.Upstream.AppBackground", 1);
   histogram_tester.ExpectTotalCount(
       "DataUse.AppTabState.Downstream.AppBackground", 1);
 }
 
 TEST_F(DataUseMeasurementTest, ContentType) {
   {
     base::HistogramTester histogram_tester;
     std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
     data_use_measurement_.OnBeforeURLRequest(request.get());
-    data_use_measurement_.OnNetworkBytesReceived(*request, 1000);
-    histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTraffic",
-                                        DataUseUserData::OTHER, 1000);
+    data_use_measurement_.OnNetworkBytesReceived(*request, 10 * 1024);
+    histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTrafficKB",
+                                        DataUseUserData::OTHER, 10);
   }
 
   {
     base::HistogramTester histogram_tester;
     std::unique_ptr<net::URLRequest> request =
         CreateTestRequest(kServiceRequest);
     data_use_measurement_.OnBeforeURLRequest(request.get());
     data_use_measurement_.OnNetworkBytesReceived(*request, 1000);
     histogram_tester.ExpectUniqueSample("DataUse.ContentType.Services",
                                         DataUseUserData::OTHER, 1000);
   }
 
   // Video request in foreground.
   {
     base::HistogramTester histogram_tester;
     std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
 
     ascriber_.SetTabVisibility(true);
     url_request_classifier_->set_content_type(DataUseUserData::VIDEO);
     data_use_measurement_.OnBeforeURLRequest(request.get());
     data_use_measurement_.OnHeadersReceived(request.get(), nullptr);
-    data_use_measurement_.OnNetworkBytesReceived(*request, 1000);
+    data_use_measurement_.OnNetworkBytesReceived(*request, 10 * 1024);
 
-    histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTraffic",
-                                        DataUseUserData::VIDEO, 1000);
+    histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTrafficKB",
+                                        DataUseUserData::VIDEO, 10);
   }
 
   // Audio request from background tab.
   {
     base::HistogramTester histogram_tester;
     std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
     ascriber_.SetTabVisibility(false);
     url_request_classifier_->set_content_type(DataUseUserData::AUDIO);
     data_use_measurement_.OnBeforeURLRequest(request.get());
     data_use_measurement_.OnHeadersReceived(request.get(), nullptr);
-    data_use_measurement_.OnNetworkBytesReceived(*request, 1000);
+    data_use_measurement_.OnNetworkBytesReceived(*request, 10 * 1024);
 
-    histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTraffic",
+    histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTrafficKB",
                                         DataUseUserData::AUDIO_TABBACKGROUND,
-                                        1000);
+                                        10);
   }
 
   // Video request from background app.
   {
     base::HistogramTester histogram_tester;
     std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
     url_request_classifier_->set_content_type(DataUseUserData::VIDEO);
     data_use_measurement()->OnApplicationStateChangeForTesting(
         base::android::APPLICATION_STATE_HAS_STOPPED_ACTIVITIES);
     ascriber_.SetTabVisibility(false);
     data_use_measurement_.OnBeforeURLRequest(request.get());
     data_use_measurement_.OnHeadersReceived(request.get(), nullptr);
-    data_use_measurement_.OnNetworkBytesReceived(*request, 1000);
+    data_use_measurement_.OnNetworkBytesReceived(*request, 10 * 1024);
 
-    histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTraffic",
+    histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTrafficKB",
                                         DataUseUserData::VIDEO_APPBACKGROUND,
-                                        1000);
+                                        10);
   }
 }
 
+TEST_F(DataUseMeasurementTest, ContentTypeInKB) {
+  base::HistogramTester histogram_tester;
+  std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
+  url_request_classifier_->set_content_type(DataUseUserData::VIDEO);
+  data_use_measurement()->OnApplicationStateChangeForTesting(
+      base::android::APPLICATION_STATE_HAS_STOPPED_ACTIVITIES);
+  ascriber_.SetTabVisibility(false);
+  data_use_measurement_.OnBeforeURLRequest(request.get());
+  data_use_measurement_.OnHeadersReceived(request.get(), nullptr);
+  data_use_measurement_.OnNetworkBytesReceived(*request, 600);
+
+  // UserTrafficKB metric is not recorded for the first 600 bytes of data use.
+  histogram_tester.ExpectTotalCount("DataUse.ContentType.UserTrafficKB", 0);
+
+  data_use_measurement_.OnNetworkBytesReceived(*request, 600);
+
+  // UserTrafficKB recorded for 1KB.
+  histogram_tester.ExpectUniqueSample("DataUse.ContentType.UserTrafficKB",
+                                      DataUseUserData::VIDEO_APPBACKGROUND, 1);
+}
+
 #endif
 
 }  // namespace data_use_measurement