Chromium Code Reviews| Index: components/data_use_measurement/content/data_use_measurement.cc |
| diff --git a/components/data_use_measurement/content/data_use_measurement.cc b/components/data_use_measurement/content/data_use_measurement.cc |
| index 23f916c6ae054c38efb296be694b623aa91cd5ab..24b55e4eaefa055f169208e6a8bce820dea433ff 100644 |
| --- a/components/data_use_measurement/content/data_use_measurement.cc |
| +++ b/components/data_use_measurement/content/data_use_measurement.cc |
| @@ -9,6 +9,7 @@ |
| #include "base/strings/stringprintf.h" |
| #include "build/build_config.h" |
| #include "content/public/browser/resource_request_info.h" |
| +#include "components/metrics/metrics_data_use_measurements.h" |
| #include "net/base/network_change_notifier.h" |
| #include "net/base/upload_data_stream.h" |
| #include "net/http/http_response_headers.h" |
| @@ -88,14 +89,16 @@ void DataUseMeasurement::ReportDataUseUMA( |
| DataUseUserData* attached_service_data = reinterpret_cast<DataUseUserData*>( |
| request->GetUserData(DataUseUserData::kUserDataKey)); |
| - |
| + DataUseUserData::ServiceName service_name = |
| + attached_service_data ? attached_service_data->service_name() |
| + : DataUseUserData::NOT_TAGGED; |
| if (!is_user_traffic) { |
| - DataUseUserData::ServiceName service_name = |
| - attached_service_data ? attached_service_data->service_name() |
| - : DataUseUserData::NOT_TAGGED; |
| ReportDataUsageServices(service_name, UPSTREAM, total_upload_bytes); |
| ReportDataUsageServices(service_name, DOWNSTREAM, total_received_bytes); |
| } |
| + metrics::MetricsDataUseMeasurements::GetInstance()->UpdateMetricsUsagePrefs( |
|
Alexei Svitkine (slow)
2016/03/18 22:23:29
We can discuss more offline, but I would prefer th
gayane -on leave until 09-2017
2016/03/29 16:06:20
Done.
|
| + attached_service_data->GetServiceNameAsString(service_name), |
| + total_upload_bytes + total_received_bytes); |
| } |
| #if defined(OS_ANDROID) |
| @@ -145,5 +148,4 @@ void DataUseMeasurement::ReportDataUsageServices( |
| message_size); |
| } |
| } |
| - |
| } // namespace data_use_measurement |