Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/page_load_metrics/observers/subresource_filter_metrics_ observer.h" | 5 #include "chrome/browser/page_load_metrics/observers/subresource_filter_metrics_ observer.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_ test_harness.h" | 8 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_ test_harness.h" |
| 9 | 9 |
| 10 namespace { | 10 namespace { |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 135 .InMilliseconds(), | 135 .InMilliseconds(), |
| 136 1); | 136 1); |
| 137 | 137 |
| 138 histogram_tester().ExpectTotalCount( | 138 histogram_tester().ExpectTotalCount( |
| 139 internal::kHistogramSubresourceFilterForegroundDuration, 1); | 139 internal::kHistogramSubresourceFilterForegroundDuration, 1); |
| 140 } | 140 } |
| 141 | 141 |
| 142 TEST_F(SubresourceFilterMetricsObserverTest, Subresources) { | 142 TEST_F(SubresourceFilterMetricsObserverTest, Subresources) { |
| 143 NavigateAndCommit(GURL(kDefaultTestUrl)); | 143 NavigateAndCommit(GURL(kDefaultTestUrl)); |
| 144 | 144 |
| 145 SimulateLoadedResource({false /* was_cached */, | 145 SimulateLoadedResource( |
| 146 1024 * 40 /* raw_body_bytes */, | 146 {false /* was_cached */, 1024 * 40 /* raw_body_bytes */, |
| 147 false /* data_reduction_proxy_used */, | 147 false /* data_reduction_proxy_used */, false /* was_lofi_response */, |
| 148 0 /* original_network_content_length */}); | 148 0 /* original_network_content_length */}); |
| 149 | 149 |
| 150 page_load_metrics::PageLoadTiming timing; | 150 page_load_metrics::PageLoadTiming timing; |
| 151 timing.navigation_start = base::Time::FromDoubleT(1); | 151 timing.navigation_start = base::Time::FromDoubleT(1); |
| 152 page_load_metrics::PageLoadMetadata metadata; | 152 page_load_metrics::PageLoadMetadata metadata; |
| 153 metadata.behavior_flags |= | 153 metadata.behavior_flags |= |
| 154 blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch; | 154 blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch; |
| 155 SimulateTimingAndMetadataUpdate(timing, metadata); | 155 SimulateTimingAndMetadataUpdate(timing, metadata); |
| 156 | 156 |
| 157 SimulateLoadedResource({false /* was_cached */, | 157 SimulateLoadedResource( |
| 158 1024 * 20 /* raw_body_bytes */, | 158 {false /* was_cached */, 1024 * 20 /* raw_body_bytes */, |
| 159 false /* data_reduction_proxy_used */, | 159 false /* data_reduction_proxy_used */, false /* was_lofi_response */, |
| 160 0 /* original_network_content_length */}); | 160 0 /* original_network_content_length */}); |
| 161 | 161 |
| 162 SimulateLoadedResource({true /* was_cached */, 1024 * 10 /* raw_body_bytes */, | 162 SimulateLoadedResource({true /* was_cached */, 1024 * 10 /* raw_body_bytes */, |
| 163 false /* data_reduction_proxy_used */, | 163 false /* data_reduction_proxy_used */, |
| 164 false /* was_lofi_response */, | |
| 164 0 /* original_network_content_length */}); | 165 0 /* original_network_content_length */}); |
| 165 | 166 |
| 166 histogram_tester().ExpectTotalCount( | 167 histogram_tester().ExpectTotalCount( |
| 167 internal::kHistogramSubresourceFilterCount, 1); | 168 internal::kHistogramSubresourceFilterCount, 1); |
| 168 | 169 |
| 169 // Navigate away from the current page to force logging of request and byte | 170 // Navigate away from the current page to force logging of request and byte |
| 170 // metrics. | 171 // metrics. |
| 171 NavigateToUntrackedUrl(); | 172 NavigateToUntrackedUrl(); |
| 172 | 173 |
| 173 histogram_tester().ExpectTotalCount( | 174 histogram_tester().ExpectTotalCount( |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 230 internal::kHistogramSubresourceFilterNoMediaCacheBytes, 1); | 231 internal::kHistogramSubresourceFilterNoMediaCacheBytes, 1); |
| 231 histogram_tester().ExpectBucketCount( | 232 histogram_tester().ExpectBucketCount( |
| 232 internal::kHistogramSubresourceFilterNoMediaCacheBytes, 10, 1); | 233 internal::kHistogramSubresourceFilterNoMediaCacheBytes, 10, 1); |
| 233 } | 234 } |
| 234 | 235 |
| 235 TEST_F(SubresourceFilterMetricsObserverTest, SubresourcesWithMedia) { | 236 TEST_F(SubresourceFilterMetricsObserverTest, SubresourcesWithMedia) { |
| 236 NavigateAndCommit(GURL(kDefaultTestUrl)); | 237 NavigateAndCommit(GURL(kDefaultTestUrl)); |
| 237 | 238 |
| 238 SimulateMediaPlayed(); | 239 SimulateMediaPlayed(); |
| 239 | 240 |
| 240 SimulateLoadedResource({false /* was_cached */, | 241 SimulateLoadedResource( |
| 241 1024 * 40 /* raw_body_bytes */, | 242 {false /* was_cached */, 1024 * 40 /* raw_body_bytes */, |
| 242 false /* data_reduction_proxy_used */, | 243 false /* data_reduction_proxy_used */, false /* was_lofi_response */, |
| 243 0 /* original_network_content_length */}); | 244 0 /* original_network_content_length */}); |
| 244 | 245 |
| 245 page_load_metrics::PageLoadTiming timing; | 246 page_load_metrics::PageLoadTiming timing; |
| 246 timing.navigation_start = base::Time::FromDoubleT(1); | 247 timing.navigation_start = base::Time::FromDoubleT(1); |
| 247 page_load_metrics::PageLoadMetadata metadata; | 248 page_load_metrics::PageLoadMetadata metadata; |
| 248 metadata.behavior_flags |= | 249 metadata.behavior_flags |= |
| 249 blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch; | 250 blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch; |
| 250 SimulateTimingAndMetadataUpdate(timing, metadata); | 251 SimulateTimingAndMetadataUpdate(timing, metadata); |
| 251 | 252 |
| 252 SimulateLoadedResource({false /* was_cached */, | 253 SimulateLoadedResource( |
| 253 1024 * 20 /* raw_body_bytes */, | 254 {false /* was_cached */, 1024 * 20 /* raw_body_bytes */, |
| 254 false /* data_reduction_proxy_used */, | 255 false /* data_reduction_proxy_used */, false /* was_lofi_response */, |
| 255 0 /* original_network_content_length */}); | 256 0 /* original_network_content_length */}); |
| 256 | 257 |
| 257 SimulateLoadedResource({true /* was_cached */, 1024 * 10 /* raw_body_bytes */, | 258 SimulateLoadedResource({true /* was_cached */, 1024 * 10 /* raw_body_bytes */, |
| 258 false /* data_reduction_proxy_used */, | 259 false /* data_reduction_proxy_used */, |
| 260 false /* was_lofi_response */, | |
|
bengr
2017/04/20 17:36:18
Why no test coverage for was_lofi_response == true
RyanSturm
2017/04/20 20:25:44
Irrelevant and unused for this observer.
| |
| 259 0 /* original_network_content_length */}); | 261 0 /* original_network_content_length */}); |
| 260 | 262 |
| 261 histogram_tester().ExpectTotalCount( | 263 histogram_tester().ExpectTotalCount( |
| 262 internal::kHistogramSubresourceFilterCount, 1); | 264 internal::kHistogramSubresourceFilterCount, 1); |
| 263 | 265 |
| 264 // Navigate away from the current page to force logging of request and byte | 266 // Navigate away from the current page to force logging of request and byte |
| 265 // metrics. | 267 // metrics. |
| 266 NavigateToUntrackedUrl(); | 268 NavigateToUntrackedUrl(); |
| 267 | 269 |
| 268 histogram_tester().ExpectTotalCount( | 270 histogram_tester().ExpectTotalCount( |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 319 histogram_tester().ExpectTotalCount( | 321 histogram_tester().ExpectTotalCount( |
| 320 internal::kHistogramSubresourceFilterMediaNetworkBytes, 1); | 322 internal::kHistogramSubresourceFilterMediaNetworkBytes, 1); |
| 321 histogram_tester().ExpectBucketCount( | 323 histogram_tester().ExpectBucketCount( |
| 322 internal::kHistogramSubresourceFilterMediaNetworkBytes, 60, 1); | 324 internal::kHistogramSubresourceFilterMediaNetworkBytes, 60, 1); |
| 323 | 325 |
| 324 histogram_tester().ExpectTotalCount( | 326 histogram_tester().ExpectTotalCount( |
| 325 internal::kHistogramSubresourceFilterMediaCacheBytes, 1); | 327 internal::kHistogramSubresourceFilterMediaCacheBytes, 1); |
| 326 histogram_tester().ExpectBucketCount( | 328 histogram_tester().ExpectBucketCount( |
| 327 internal::kHistogramSubresourceFilterMediaCacheBytes, 10, 1); | 329 internal::kHistogramSubresourceFilterMediaCacheBytes, 10, 1); |
| 328 } | 330 } |
| OLD | NEW |