Index: chrome/browser/subresource_filter/subresource_filter_browsertest.cc |
diff --git a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc |
index 925946af710f7944127520f1e106329b4c07d747..82a1b95664ecd6ff022f4c8e6fa624a59bcb1229 100644 |
--- a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc |
+++ b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc |
@@ -22,6 +22,7 @@ |
#include "chrome/browser/metrics/subprocess_metrics_provider.h" |
#include "chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer.h" |
#include "chrome/browser/safe_browsing/test_safe_browsing_service.h" |
+#include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h" |
#include "chrome/browser/subresource_filter/test_ruleset_publisher.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_commands.h" |
@@ -109,8 +110,7 @@ constexpr const char kEvaluationCPUDuration[] = |
"SubresourceFilter.SubresourceLoad.Evaluation.CPUDuration"; |
// Other histograms. |
-const char kSubresourceFilterPromptHistogram[] = |
- "SubresourceFilter.Prompt.NumVisibility"; |
+const char kSubresourceFilterActionsHistogram[] = "SubresourceFilter.Actions"; |
// Database manager that allows any URL to be configured as blacklisted for |
// testing. |
@@ -486,7 +486,8 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, SubFrameActivation) { |
ASSERT_NO_FATAL_FAILURE(ExpectParsedScriptElementLoadedStatusInFrames( |
kSubframeNames, kExpectScriptInFrameToLoad)); |
- tester.ExpectBucketCount(kSubresourceFilterPromptHistogram, true, 1); |
+ tester.ExpectBucketCount(kSubresourceFilterActionsHistogram, kActionUIShown, |
+ 1); |
} |
IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, |
@@ -737,13 +738,16 @@ IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, |
ConfigureAsPhishingURL(url); |
base::HistogramTester tester; |
ui_test_utils::NavigateToURL(browser(), url); |
- tester.ExpectBucketCount(kSubresourceFilterPromptHistogram, true, 1); |
+ tester.ExpectBucketCount(kSubresourceFilterActionsHistogram, kActionUIShown, |
+ 1); |
// Check that the bubble is not shown again for this navigation. |
EXPECT_FALSE(IsDynamicScriptElementLoaded(FindFrameByName("five"))); |
- tester.ExpectBucketCount(kSubresourceFilterPromptHistogram, true, 1); |
+ tester.ExpectBucketCount(kSubresourceFilterActionsHistogram, kActionUIShown, |
+ 1); |
// Check that bubble is shown for new navigation. |
ui_test_utils::NavigateToURL(browser(), url); |
- tester.ExpectBucketCount(kSubresourceFilterPromptHistogram, true, 2); |
+ tester.ExpectBucketCount(kSubresourceFilterActionsHistogram, kActionUIShown, |
+ 2); |
} |
IN_PROC_BROWSER_TEST_F(SubresourceFilterBrowserTest, |