Rename SubresourceFilter AdDelay metrics

The AdDelay historgram metrics aren't strictly used when AdDelay is on.

Bug: 859077
Change-Id: I2ced2154a45e22cadf9f0ce48f9976ee9ecd2e49
Reviewed-on: https://chromium-review.googlesource.com/1120740Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Commit-Queue: John Delaney <johnidel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575323}

components/subresource_filter/content/common/ad_delay_throttle.cc

@@ -26,7 +26,7 @@ namespace subresource_filter {
 namespace {
 
 void LogSecureInfo(AdDelayThrottle::SecureInfo info) {
-  UMA_HISTOGRAM_ENUMERATION("SubresourceFilter.AdDelay.SecureInfo", info);
+  UMA_HISTOGRAM_ENUMERATION("Ads.Features.ResourceIsSecure", info);
 }
 
 class InsecureCondition : public AdDelayThrottle::DeferCondition {
@@ -65,7 +65,7 @@ class NonIsolatedCondition : public AdDelayThrottle::DeferCondition {
   ~NonIsolatedCondition() override {
     if (provider()->IsAdRequest()) {
       UMA_HISTOGRAM_ENUMERATION(
-          "SubresourceFilter.AdDelay.IsolatedInfo",
+          "Ads.Features.AdResourceIsIsolated",
           was_condition_ever_satisfied()
               ? AdDelayThrottle::IsolatedInfo::kNonIsolatedAd
               : AdDelayThrottle::IsolatedInfo::kIsolatedAd);

components/subresource_filter/content/common/ad_delay_throttle_unittest.cc

@@ -448,7 +448,7 @@ TEST_P(AdDelayThrottleEnabledParamTest, SecureMetrics) {
   loader_factory_.AddResponse(insecure_url.spec(), "foo");
   loader_factory_.AddResponse(secure_url.spec(), "foo");
 
-  const char kSecureHistogram[] = "SubresourceFilter.AdDelay.SecureInfo";
+  const char kSecureHistogram[] = "Ads.Features.ResourceIsSecure";
   {
     base::HistogramTester histograms;
     {
@@ -510,7 +510,7 @@ TEST_P(AdDelayThrottleEnabledParamTest, IsolatedMetrics) {
   const GURL url("https://example.test/ad.js");
   loader_factory_.AddResponse(url.spec(), "foo");
 
-  const char kIsolatedHistogram[] = "SubresourceFilter.AdDelay.IsolatedInfo";
+  const char kIsolatedHistogram[] = "Ads.Features.AdResourceIsIsolated";
   {
     base::HistogramTester histograms;
     {

tools/metrics/histograms/histograms.xml

@@ -577,6 +577,24 @@ uploading your change for review.
   </summary>
 </histogram>
 
+<histogram name="Ads.Features.AdResourceIsIsolated" enum="AdIsolatedInfo">
+  <owner>csharrison@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    For a given ad request, logs information related to whether it is isolated
+    from the top-level context. Logged per ad subresource request.
+  </summary>
+</histogram>
+
+<histogram name="Ads.Features.ResourceIsSecure" enum="AdSecureInfo">
+  <owner>csharrison@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    For a given request, logs information related to whether it is marked as an
+    ad, and whether it is secure (e.g. https). Logged per subresource request.
+  </summary>
+</histogram>
+
 <histogram name="AnchorElementMetrics.Clicked.ContainsImage" enum="Boolean">
   <owner>chelu@chromium.org</owner>
   <summary>
@@ -97916,6 +97934,9 @@ uploading your change for review.
 </histogram>
 
 <histogram name="SubresourceFilter.AdDelay.IsolatedInfo" enum="AdIsolatedInfo">
+  <obsolete>
+    Deprecated July 2018. Replaced with Ads.Features.AdResourceIsIsolated.
+  </obsolete>
   <owner>csharrison@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -97925,6 +97946,9 @@ uploading your change for review.
 </histogram>
 
 <histogram name="SubresourceFilter.AdDelay.SecureInfo" enum="AdSecureInfo">
+  <obsolete>
+    Deprecated July 2018. Replaced with Ads.Features.ResourceIsSecure.
+  </obsolete>
   <owner>csharrison@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>