Chromium Code Reviews| Index: components/data_use_measurement/core/data_use_recorder.cc |
| diff --git a/components/data_use_measurement/core/data_use_recorder.cc b/components/data_use_measurement/core/data_use_recorder.cc |
| index ce45d1b7101eef0b2d2bfb5f25e62df23c30186e..fe63773300889c60d96691ff51029ead3cd0f4c5 100644 |
| --- a/components/data_use_measurement/core/data_use_recorder.cc |
| +++ b/components/data_use_measurement/core/data_use_recorder.cc |
| @@ -3,12 +3,11 @@ |
| // found in the LICENSE file. |
| #include "components/data_use_measurement/core/data_use_recorder.h" |
| - |
|
RyanSturm
2016/11/29 20:33:00
Add this whitespace back.
Not at Google. Contact bengr
2016/11/30 00:21:16
Done.
|
| #include "net/url_request/url_request.h" |
| namespace data_use_measurement { |
| -DataUseRecorder::DataUseRecorder() {} |
| +DataUseRecorder::DataUseRecorder() : main_url_request_(nullptr) {} |
| DataUseRecorder::~DataUseRecorder() {} |
| @@ -16,7 +15,7 @@ bool DataUseRecorder::IsDataUseComplete() { |
| return pending_url_requests_.empty() && pending_data_sources_.empty(); |
| } |
| -void DataUseRecorder::OnBeforeUrlRequest(net::URLRequest* request) { |
| +void DataUseRecorder::AddPendingURLRequest(net::URLRequest* request) { |
| pending_url_requests_.insert(request); |
| } |
| @@ -24,6 +23,12 @@ void DataUseRecorder::OnUrlRequestDestroyed(net::URLRequest* request) { |
| pending_url_requests_.erase(request); |
| } |
| +void DataUseRecorder::RemoveAllPendingURLRequests() { |
| + pending_url_requests_.clear(); |
| +} |
| + |
| +void DataUseRecorder::OnBeforeUrlRequest(net::URLRequest* request) {} |
| + |
| void DataUseRecorder::OnNetworkBytesReceived(net::URLRequest* request, |
| int64_t bytes_received) { |
| data_use_.total_bytes_received_ += bytes_received; |
| @@ -46,8 +51,12 @@ void DataUseRecorder::RemovePendingDataSource(void* source) { |
| pending_data_sources_.erase(source); |
| } |
| -bool DataUseRecorder::HasPendingURLRequest(const net::URLRequest* request) { |
| +bool DataUseRecorder::HasPendingURLRequest(net::URLRequest* request) { |
| return pending_url_requests_.find(request) != pending_url_requests_.end(); |
| } |
| +void DataUseRecorder::MergeFrom(DataUseRecorder* other) { |
| + data_use_.MergeFrom(other->data_use()); |
| +} |
| + |
| } // namespace data_use_measurement |