Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/content/data_use_measurement.h" | 5 #include "components/data_use_measurement/content/data_use_measurement.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 204 | 204 |
| 205 { | 205 { |
| 206 base::HistogramTester histogram_tester; | 206 base::HistogramTester histogram_tester; |
| 207 data_use_measurement()->OnApplicationStateChangeForTesting( | 207 data_use_measurement()->OnApplicationStateChangeForTesting( |
| 208 base::android::APPLICATION_STATE_HAS_STOPPED_ACTIVITIES); | 208 base::android::APPLICATION_STATE_HAS_STOPPED_ACTIVITIES); |
| 209 data_use_measurement_.OnNetworkBytesReceived(*request, 1000); | 209 data_use_measurement_.OnNetworkBytesReceived(*request, 1000); |
| 210 histogram_tester.ExpectTotalCount( | 210 histogram_tester.ExpectTotalCount( |
| 211 "DataUse.TrafficSize.User.Downstream.Background." + kConnectionType, 1); | 211 "DataUse.TrafficSize.User.Downstream.Background." + kConnectionType, 1); |
| 212 } | 212 } |
| 213 } | 213 } |
| 214 | |
| 215 TEST_F(DataUseMeasurementTest, TimeOfBackgroundDownstreamBytes) { | |
| 216 base::HistogramTester histogram_tester; | |
| 217 std::unique_ptr<net::URLRequest> request = CreateTestRequest(false); | |
| 218 data_use_measurement_.OnBeforeURLRequest(request.get()); | |
| 219 | |
| 220 { | |
| 221 base::HistogramTester histogram_tester; | |
| 222 data_use_measurement()->OnApplicationStateChange( | |
| 223 base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES); | |
| 224 data_use_measurement_.OnNetworkBytesSent(*request, 100); | |
| 225 data_use_measurement_.OnNetworkBytesReceived(*request, 1000); | |
| 226 data_use_measurement_.OnNetworkBytesSent(*request, 200); | |
| 227 data_use_measurement_.OnNetworkBytesReceived(*request, 2000); | |
| 228 histogram_tester.ExpectTotalCount("DataUse.BackgroundDownstreamBytes.User", | |
| 229 0); | |
| 230 histogram_tester.ExpectTotalCount( | |
| 231 "DataUse.BackgroundDownstreamFirstRead.User", 0); | |
| 232 } | |
| 233 | |
| 234 { | |
| 235 base::HistogramTester histogram_tester; | |
| 236 data_use_measurement()->OnApplicationStateChange( | |
|
Not at Google. Contact bengr
2016/10/14 23:10:57
Would suggest improving this test by adding reques
Raj
2016/10/15 19:36:14
Done.
| |
| 237 base::android::APPLICATION_STATE_HAS_STOPPED_ACTIVITIES); | |
| 238 data_use_measurement_.OnNetworkBytesSent(*request, 100); | |
| 239 data_use_measurement_.OnNetworkBytesReceived(*request, 1000); | |
| 240 data_use_measurement_.OnNetworkBytesSent(*request, 200); | |
| 241 data_use_measurement_.OnNetworkBytesReceived(*request, 2000); | |
| 242 histogram_tester.ExpectTotalCount("DataUse.BackgroundDownstreamBytes.User", | |
| 243 3000); | |
| 244 histogram_tester.ExpectTotalCount( | |
| 245 "DataUse.BackgroundDownstreamFirstRead.User", 1); | |
| 246 } | |
| 247 | |
| 248 { | |
| 249 base::HistogramTester histogram_tester; | |
|
Not at Google. Contact bengr
2016/10/14 23:10:57
This and the first test seem exactly the same. Did
Raj
2016/10/15 19:36:15
Added a test for DataUse.BackgroundDownstreamFirst
| |
| 250 data_use_measurement()->OnApplicationStateChange( | |
| 251 base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES); | |
| 252 data_use_measurement_.OnNetworkBytesSent(*request, 100); | |
| 253 data_use_measurement_.OnNetworkBytesReceived(*request, 1000); | |
| 254 data_use_measurement_.OnNetworkBytesSent(*request, 200); | |
| 255 data_use_measurement_.OnNetworkBytesReceived(*request, 2000); | |
| 256 histogram_tester.ExpectTotalCount("DataUse.BackgroundDownstreamBytes.User", | |
| 257 0); | |
| 258 histogram_tester.ExpectTotalCount( | |
| 259 "DataUse.BackgroundDownstreamFirstRead.User", 0); | |
| 260 } | |
| 261 } | |
| 214 #endif | 262 #endif |
| 215 | 263 |
| 216 } // namespace data_use_measurement | 264 } // namespace data_use_measurement |
| OLD | NEW |