| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/data_use_measurement/core/data_use.h" | 5 #include "components/data_use_measurement/core/data_use.h" |
| 6 | 6 |
| 7 namespace data_use_measurement { | 7 namespace data_use_measurement { |
| 8 | 8 |
| 9 DataUse::DataUse() : total_bytes_sent_(0), total_bytes_received_(0) {} | 9 DataUse::DataUse(TrafficType traffic_type) |
| 10 | 10 : traffic_type_(traffic_type), |
| 11 DataUse::DataUse(const DataUse& other) : | 11 total_bytes_sent_(0), |
| 12 total_bytes_sent_(other.total_bytes_sent_), | 12 total_bytes_received_(0) {} |
| 13 total_bytes_received_(other.total_bytes_received_) {} | |
| 14 | 13 |
| 15 DataUse::~DataUse() {} | 14 DataUse::~DataUse() {} |
| 16 | 15 |
| 17 void DataUse::MergeFrom(const DataUse& other) { | 16 void DataUse::MergeFrom(const DataUse& other) { |
| 17 // Traffic type need not be same while merging. One of the data use created |
| 18 // when mainframe is created could have UNKNOWN traffic type, and later merged |
| 19 // with the data use created for its mainframe request which could be |
| 20 // USER_TRAFFIC. |
| 18 total_bytes_sent_ += other.total_bytes_sent_; | 21 total_bytes_sent_ += other.total_bytes_sent_; |
| 19 total_bytes_received_ += other.total_bytes_received_; | 22 total_bytes_received_ += other.total_bytes_received_; |
| 20 } | 23 } |
| 21 | 24 |
| 22 } // namespace data_use_measurement | 25 } // namespace data_use_measurement |
| OLD | NEW |