| Index: chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
|
| diff --git a/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
|
| index 346dc1646c63f4e80ca12ace33338f684037adf6..a03a96fd4a306f1f623ec932407feb8cece06a90 100644
|
| --- a/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
|
| +++ b/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
|
| @@ -7,6 +7,7 @@
|
| #include <memory>
|
|
|
| #include "base/memory/ptr_util.h"
|
| +#include "base/metrics/metrics_hashes.h"
|
| #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h"
|
| #include "components/subresource_filter/content/browser/subresource_filter_observer_manager.h"
|
| #include "components/subresource_filter/core/common/activation_decision.h"
|
| @@ -88,6 +89,22 @@ class SubresourceFilterMetricsObserverTest
|
| simulator->Commit();
|
| }
|
|
|
| + void ExpectActivationDecision(
|
| + const char* url,
|
| + subresource_filter::ActivationDecision decision) {
|
| + histogram_tester().ExpectBucketCount(
|
| + internal::kHistogramSubresourceFilterActivationDecision,
|
| + static_cast<int>(decision), 1);
|
| +
|
| + ASSERT_EQ(1ul, ukm_tester().entries_count());
|
| + const ukm::UkmSource* source = ukm_tester().GetSourceForUrl(url);
|
| + EXPECT_TRUE(
|
| + ukm_tester().HasEntry(*source, internal::kUkmSubresourceFilterName));
|
| + ukm_tester().ExpectMetric(*source, internal::kUkmSubresourceFilterName,
|
| + internal::kUkmSubresourceFilterActivationDecision,
|
| + static_cast<int64_t>(decision));
|
| + }
|
| +
|
| private:
|
| // Owned by the WebContents.
|
| subresource_filter::SubresourceFilterObserverManager* observer_manager_ =
|
| @@ -109,11 +126,9 @@ TEST_F(SubresourceFilterMetricsObserverTest,
|
| NavigateToUntrackedUrl();
|
|
|
| EXPECT_EQ(1u, TotalMetricsRecorded());
|
| - histogram_tester().ExpectBucketCount(
|
| - internal::kHistogramSubresourceFilterActivationDecision,
|
| - static_cast<int>(subresource_filter::ActivationDecision::
|
| - ACTIVATION_CONDITIONS_NOT_MET),
|
| - 1);
|
| + ExpectActivationDecision(
|
| + kDefaultTestUrl,
|
| + subresource_filter::ActivationDecision::ACTIVATION_CONDITIONS_NOT_MET);
|
| }
|
|
|
| TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
|
| @@ -130,6 +145,8 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
|
| NavigateToUntrackedUrl();
|
|
|
| EXPECT_GT(TotalMetricsRecorded(), 0u);
|
| + ExpectActivationDecision(kDefaultTestUrlWithActivation,
|
| + subresource_filter::ActivationDecision::ACTIVATED);
|
|
|
| histogram_tester().ExpectTotalCount(
|
| internal::kHistogramSubresourceFilterCount, 1);
|
| @@ -239,6 +256,8 @@ TEST_F(SubresourceFilterMetricsObserverTest, Subresources) {
|
| nullptr /* data_reduction_proxy_data */,
|
| content::ResourceType::RESOURCE_TYPE_SCRIPT, 0});
|
|
|
| + ExpectActivationDecision(kDefaultTestUrlWithActivation,
|
| + subresource_filter::ActivationDecision::ACTIVATED);
|
| histogram_tester().ExpectTotalCount(
|
| internal::kHistogramSubresourceFilterCount, 1);
|
|
|
| @@ -342,6 +361,8 @@ TEST_F(SubresourceFilterMetricsObserverTest, SubresourcesWithMedia) {
|
| nullptr /* data_reduction_proxy_data */,
|
| content::ResourceType::RESOURCE_TYPE_SCRIPT, 0});
|
|
|
| + ExpectActivationDecision(kDefaultTestUrlWithActivation,
|
| + subresource_filter::ActivationDecision::ACTIVATED);
|
| histogram_tester().ExpectTotalCount(
|
| internal::kHistogramSubresourceFilterCount, 1);
|
|
|
|
|