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 "chrome/browser/android/data_usage/external_data_use_reporter.h" | 5 #include "chrome/browser/android/data_usage/external_data_use_reporter.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 | 120 |
121 // Returns a default data_usage::DataUse object. | 121 // Returns a default data_usage::DataUse object. |
122 data_usage::DataUse default_data_use() { | 122 data_usage::DataUse default_data_use() { |
123 return data_usage::DataUse( | 123 return data_usage::DataUse( |
124 GURL(kDefaultURL), base::TimeTicks::Now(), GURL(), kDefaultTabId, | 124 GURL(kDefaultURL), base::TimeTicks::Now(), GURL(), kDefaultTabId, |
125 net::NetworkChangeNotifier::CONNECTION_UNKNOWN, "", | 125 net::NetworkChangeNotifier::CONNECTION_UNKNOWN, "", |
126 default_upload_bytes(), default_download_bytes()); | 126 default_upload_bytes(), default_download_bytes()); |
127 } | 127 } |
128 | 128 |
129 void OnDataUse(const data_usage::DataUse& data_use) { | 129 void OnDataUse(const data_usage::DataUse& data_use) { |
130 std::unique_ptr<std::deque<const data_usage::DataUse>> data_use_list( | 130 std::unique_ptr<std::vector<const data_usage::DataUse>> data_use_list( |
131 new std::deque<const data_usage::DataUse>()); | 131 new std::vector<const data_usage::DataUse>()); |
132 data_use_list->push_back(data_use); | 132 data_use_list->push_back(data_use); |
133 external_data_use_reporter()->OnDataUse(std::move(data_use_list)); | 133 external_data_use_reporter()->OnDataUse(std::move(data_use_list)); |
134 } | 134 } |
135 | 135 |
136 ExternalDataUseObserver* external_data_use_observer() const { | 136 ExternalDataUseObserver* external_data_use_observer() const { |
137 return external_data_use_observer_.get(); | 137 return external_data_use_observer_.get(); |
138 } | 138 } |
139 | 139 |
140 ExternalDataUseReporter* external_data_use_reporter() const { | 140 ExternalDataUseReporter* external_data_use_reporter() const { |
141 return external_data_use_observer_->GetExternalDataUseReporterForTesting(); | 141 return external_data_use_observer_->GetExternalDataUseReporterForTesting(); |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 EXPECT_EQ( | 547 EXPECT_EQ( |
548 base::TimeDelta::FromMilliseconds(kDefaultMaxDataReportSubmitWaitMsec), | 548 base::TimeDelta::FromMilliseconds(kDefaultMaxDataReportSubmitWaitMsec), |
549 external_data_use_reporter()->data_report_submit_timeout_); | 549 external_data_use_reporter()->data_report_submit_timeout_); |
550 EXPECT_EQ(kDataUseReportMinBytes, | 550 EXPECT_EQ(kDataUseReportMinBytes, |
551 external_data_use_reporter()->data_use_report_min_bytes_); | 551 external_data_use_reporter()->data_use_report_min_bytes_); |
552 } | 552 } |
553 | 553 |
554 } // namespace android | 554 } // namespace android |
555 | 555 |
556 } // namespace chrome | 556 } // namespace chrome |
OLD | NEW |