DataUse: Initialize byte counts using Android TrafficStats

components/data_use_measurement/core/data_use_measurement.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 "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ skipping 70 matching lines @@
           base::Bind(&DataUseMeasurement::OnApplicationStateChange,
                      base::Unretained(this)))),
       rx_bytes_os_(0),
       tx_bytes_os_(0),
       bytes_transferred_since_last_traffic_stats_query_(0),
       no_reads_since_background_(false)
 #endif
 {
   DCHECK(ascriber_);
   DCHECK(url_request_classifier_);
+
+#if defined(OS_ANDROID)
+  int64_t bytes = 0;
+  // Query Android traffic stats.
+  if (net::android::traffic_stats::GetCurrentUidRxBytes(&bytes))
+    rx_bytes_os_ = bytes;
+
+  if (net::android::traffic_stats::GetCurrentUidTxBytes(&bytes))
+    tx_bytes_os_ = bytes;
+#endif
 }
 
 DataUseMeasurement::~DataUseMeasurement(){};
 
 void DataUseMeasurement::OnBeforeURLRequest(net::URLRequest* request) {
   DataUseUserData* data_use_user_data = reinterpret_cast<DataUseUserData*>(
       request->GetUserData(DataUseUserData::kUserDataKey));
   if (!data_use_user_data) {
     DataUseUserData::ServiceName service_name =
         DataUseUserData::ServiceName::NOT_TAGGED;
@@ skipping 204 matching lines @@
     return;
   }
   bytes_transferred_since_last_traffic_stats_query_ = 0;
   int64_t bytes = 0;
   // Query Android traffic stats directly instead of registering with the
   // DataUseAggregator since the latter does not provide notifications for
   // the incognito traffic.
   if (net::android::traffic_stats::GetCurrentUidRxBytes(&bytes)) {
     if (rx_bytes_os_ != 0) {
       DCHECK_GE(bytes, rx_bytes_os_);
-      UMA_HISTOGRAM_COUNTS("DataUse.BytesReceived.OS", bytes - rx_bytes_os_);
+      if (bytes > rx_bytes_os_) {
+        // Do not record samples with value 0.
+        UMA_HISTOGRAM_COUNTS("DataUse.BytesReceived.OS", bytes - rx_bytes_os_);
+      }
     }
     rx_bytes_os_ = bytes;
   }
 
   if (net::android::traffic_stats::GetCurrentUidTxBytes(&bytes)) {
     if (tx_bytes_os_ != 0) {
       DCHECK_GE(bytes, tx_bytes_os_);
-      UMA_HISTOGRAM_COUNTS("DataUse.BytesSent.OS", bytes - tx_bytes_os_);
+      if (bytes > tx_bytes_os_) {
+        // Do not record samples with value 0.
+        UMA_HISTOGRAM_COUNTS("DataUse.BytesSent.OS", bytes - tx_bytes_os_);
+      }
     }
     tx_bytes_os_ = bytes;
   }
 }
 #endif
 
 void DataUseMeasurement::ReportServicesMessageSizeUMA(
     const net::URLRequest& request) {
   bool is_user_traffic = url_request_classifier_->IsUserRequest(request);
   bool is_connection_cellular =
@@ skipping 84 matching lines @@
     STATIC_HISTOGRAM_POINTER_BLOCK(
         "DataUse.ContentType.Services", AddCount(content_type, bytes),
         base::LinearHistogram::FactoryGet(
             "DataUse.ContentType.Services", 1, DataUseUserData::TYPE_MAX,
             DataUseUserData::TYPE_MAX + 1,
             base::HistogramBase::kUmaTargetedHistogramFlag));
   }
 }
 
 }  // namespace data_use_measurement