Add a low-frequency RAPPOR configuration, and use it for Safe Browsing and Permissions metrics.

tools/metrics/rappor/rappor.xml

 <!--
 Copyright 2015 The Chromium Authors. All rights reserved.
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
 
 <rappor-configuration>
 <!--
 This file is used to generate a comprehensive list of Chrome rappor metrics
 along with a detailed description for each histogram. See the design doc at
@@ skipping 18 matching lines @@
 </noise-level>
 
 <noise-level name="NORMAL_NOISE">
   <summary>
     The most common amount of noise, suitable for most fields.
   </summary>
   <noise-values fake-prob="0.5" fake-one-prob="0.5" one-coin-prob="0.75"
       zero-coin-prob="0.25"/>
 </noise-level>
 
+<noise-level name="SPARSE_NOISE">
+  <summary>
+    Reduced noise, suitable for metrics which receive limited reports (less
+    than 500,000 per day) or expect a highly skewed/sparse distribution over
+    a wide set of domains. Approval from the Chrome Privacy and Rappor teams
+    is required to implement a metric using this noise level.
+  </summary>
+  <noise-values fake-prob="0.25" fake-one-prob="0.5" one-coin-prob="0.75"
+      zero-coin-prob="0.25"/>
+</noise-level>
+
 </noise-levels>
 
 <rappor-parameter-types>
 <!--
 Parameters that rappor metrics can be collected with.  This list should be
 kept in sync with parameter type definitions in
 components/rappor/rappor_parameters.h.
 -->
 
 <rappor-parameters name="COARSE_RAPPOR_TYPE">
   <summary>
     Stricter parameters for metrics collected from a broader population.
   </summary>
   <parameters num-cohorts="128" bytes="1" hash-functions="2" fake-prob="0.5"
       fake-one-prob="0.5" one-coin-prob="0.75" zero-coin-prob="0.25"
       reporting-level="COARSE" noise-level="NORMAL_NOISE"/>
 </rappor-parameters>
 
 <rappor-parameters name="ETLD_PLUS_ONE">
   <summary>
     Deprecated parameters for collecting the domain and registry of a URL from
     UMA opt-in users. Should use UMA_RAPPOR_TYPE instead.
   </summary>
   <parameters num-cohorts="128" bytes="16" hash-functions="2" fake-prob="0.5"
       fake-one-prob="0.5" one-coin-prob="0.75" zero-coin-prob="0.25"
       reporting-level="FINE" noise-level="NORMAL_NOISE"/>
 </rappor-parameters>
 
+<rappor-parameters name="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <summary>
+    Parameters for collecting the domain and registry of a URL from UMA opt-in
+    users, using SPARSE_NOISE. Intended for sparse/skewed metrics, or low
+    frequency metrics (less than 500,000 reports per day). Explicit approval
+    from the Chrome Privacy and Rappor teams is required to use this type. New
+    metrics should also consider LOW_FREQUENCY_UMA_RAPPOR_TYPE instead.
+  </summary>
+  <parameters num-cohorts="128" bytes="16" hash-functions="2" fake-prob="0.25"
+      fake-one-prob="0.5" one-coin-prob="0.75" zero-coin-prob="0.25"
+      reporting-level="FINE" noise-level="SPARSE_NOISE"/>
+</rappor-parameters>
+
+<rappor-parameters name="LOW_FREQUENCY_SAFEBROWSING_RAPPOR_TYPE">
+  <summary>
+    Parameters for metrics related to Safe Browsing, collected from all users
+    with safe browsing enabled, using SPARSE_NOISE. Intended for sparse/skewed
+    metrics, or low frequency metrics (less than 500,000 reports per day).
+    Explicit approval from the Chrome Privacy and Rappor teams is required to
+    use this type.
+  </summary>
+  <parameters num-cohorts="128" bytes="1" hash-functions="2" fake-prob="0.25"
+      fake-one-prob="0.5" one-coin-prob="0.75" zero-coin-prob="0.25"
+      reporting-level="COARSE" noise-level="SPARSE_NOISE"/>
+</rappor-parameters>
+
+<rappor-parameters name="LOW_FREQUENCY_UMA_RAPPOR_TYPE">
+  <summary>
+    Parameters suitable for metrics from UMA opt-in users, using SPARSE_NOISE.
+    Intended for sparse/skewed metrics, or low frequency metrics (less than
+    500,000 reports per day). Explicit approval from the Chrome Privacy and
+    Rappor teams is required to use this type.
+  </summary>
+  <parameters num-cohorts="128" bytes="4" hash-functions="2" fake-prob="0.25"
+      fake-one-prob="0.5" one-coin-prob="0.75" zero-coin-prob="0.25"
+      reporting-level="FINE" noise-level="SPARSE_NOISE"/>
+</rappor-parameters>
+
 <rappor-parameters name="SAFEBROWSING_RAPPOR_TYPE">
   <summary>
-    Parameters for metrics related to Safe Browsing, collected from all user
+    Parameters for metrics related to Safe Browsing, collected from all users
     with safe browsing enabled.
   </summary>
   <parameters num-cohorts="128" bytes="1" hash-functions="2" fake-prob="0.5"
       fake-one-prob="0.5" one-coin-prob="0.75" zero-coin-prob="0.25"
       reporting-level="COARSE" noise-level="NORMAL_NOISE"/>
 </rappor-parameters>
 
 <rappor-parameters name="UMA_RAPPOR_TYPE">
   <summary>
     Parameters suitable for metrics from UMA opt-in users.
@@ skipping 124 matching lines @@
     may not actually run until the users triggers them again after the refresh.)
   </summary>
 </rappor-metric>
 
 <rappor-metric name="ContentSettings.PermissionActions_AudioCapture.Denied.Url"
     type="ETLD_PLUS_ONE">
   <owner>kcarattini@chromium.org</owner>
   <owner>miguelg@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which a AudioCapture permission prompt was Denied. Also
-    recorded as a multi-dimensional metric in Permissions.Action.AudioCapture.
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_AudioCapture.Denied.Url2 as of M52. The
+    domain for which a AudioCapture permission prompt was Denied.
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_AudioCapture.Denied.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>kcarattini@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which an AudioCapture permission prompt was Denied.
+  </summary>
+</rappor-metric>
+
 <rappor-metric
     name="ContentSettings.PermissionActions_AudioCapture.Dismissed.Url"
     type="ETLD_PLUS_ONE">
   <owner>kcarattini@chromium.org</owner>
   <owner>miguelg@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which a AudioCapture permission prompt was Dismissed. Also
-    recorded as a multi-dimensional metric in Permissions.Action.AudioCapture.
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_AudioCapture.Dismissed.Url2 as of M52.
+    The domain for which an AudioCapture permission prompt was Dismissed.
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_AudioCapture.Dismissed.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>kcarattini@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which an AudioCapture permission prompt was Dismissed.
+  </summary>
+</rappor-metric>
+
 <rappor-metric
     name="ContentSettings.PermissionActions_AudioCapture.Granted.Url"
     type="ETLD_PLUS_ONE">
   <owner>kcarattini@chromium.org</owner>
   <owner>miguelg@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which a AudioCapture permission prompt was accepted. Also
-    recorded as a multi-dimensional metric in Permissions.Action.AudioCapture.
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_AudioCapture.Granted.Url2 as of M52. The
+    domain for which an AudioCapture permission prompt was accepted.
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_AudioCapture.Granted.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>kcarattini@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which an AudioCapture permission prompt was accepted.
+  </summary>
+</rappor-metric>
+
 <rappor-metric
     name="ContentSettings.PermissionActions_AudioCapture.Ignored.Url"
     type="ETLD_PLUS_ONE">
   <owner>kcarattini@chromium.org</owner>
   <owner>miguelg@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which a AudioCapture permission prompt was Ignored. Also
-    recorded as a multi-dimensional metric in Permissions.Action.AudioCapture.
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_AudioCapture.Ignored.Url2 as of M52. The
+    domain for which an AudioCapture permission prompt was Ignored.
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_AudioCapture.Ignored.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>kcarattini@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which an AudioCapture permission prompt was Ignored.
+  </summary>
+</rappor-metric>
+
 <rappor-metric
     name="ContentSettings.PermissionActions_AudioCapture.Revoked.Url"
     type="ETLD_PLUS_ONE">
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which an AudioCapture permission was revoked. Also recorded
-    as a multi-dimensional metric in Permissions.Action.AudioCapture. Note: This
-    metric is recorded for more revocation actions as of 2016-04-01 (M51).
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_AudioCapture.Revoked.Url2 as of M52. The
+    domain for which an AudioCapture permission was revoked. Note: This metric
+    is recorded for more revocation actions as of 2016-04-01 (M51).
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_AudioCapture.Revoked.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which an AudioCapture permission was revoked.
+  </summary>
+</rappor-metric>
+
 <rappor-metric name="ContentSettings.PermissionActions_Camera.Revoked.Url"
     type="ETLD_PLUS_ONE">
   <owner>jialiul@chromium.org</owner>
   <summary>
     **DEPRECATED. Renamed to
     ContentSettings.PermissionActions_VideoCapture.Revoked.Url on
     2016-01-07.** The domain for which a camera permission was revoked.
   </summary>
 </rappor-metric>
 
 <rappor-metric name="ContentSettings.PermissionActions_Geolocation.Denied.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Geolocation.Denied.Url2 as of M52. The
+    domain for which a Geolocation permission prompt was Denied.
+  </summary>
+</rappor-metric>
+
+<rappor-metric name="ContentSettings.PermissionActions_Geolocation.Denied.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <summary>
     The domain for which a Geolocation permission prompt was Denied.
   </summary>
 </rappor-metric>
 
 <rappor-metric
     name="ContentSettings.PermissionActions_Geolocation.Dismissed.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Geolocation.Dismissed.Url2 as of M52.
+    The domain for which a Geolocation permission prompt was Dismissed.
+  </summary>
+</rappor-metric>
+
+<rappor-metric
+    name="ContentSettings.PermissionActions_Geolocation.Dismissed.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <summary>
     The domain for which a Geolocation permission prompt was Dismissed.
   </summary>
 </rappor-metric>
 
 <rappor-metric name="ContentSettings.PermissionActions_Geolocation.Granted.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Geolocation.Granted.Url2 as of M52. The
+    domain for which a Geolocation permission prompt was accepted.
+  </summary>
+</rappor-metric>
+
+<rappor-metric
+    name="ContentSettings.PermissionActions_Geolocation.Granted.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <summary>
     The domain for which a Geolocation permission prompt was accepted.
   </summary>
 </rappor-metric>
 
 <rappor-metric name="ContentSettings.PermissionActions_Geolocation.Ignored.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Geolocation.Ignored.Url2 as of M52. The
+    domain for which a Geolocation permission prompt was Ignored.
+  </summary>
+</rappor-metric>
+
+<rappor-metric
+    name="ContentSettings.PermissionActions_Geolocation.Ignored.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <summary>
     The domain for which a Geolocation permission prompt was Ignored.
   </summary>
 </rappor-metric>
 
 <rappor-metric name="ContentSettings.PermissionActions_Geolocation.Revoked.Url"
     type="ETLD_PLUS_ONE">
   <owner>jialiul@chromium.org</owner>
   <summary>
-    The domain for which a Geolocation permission was revoked. Note: This
-    metric is recorded for more revocation actions as of 2016-04-01 (M51).
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Geolocation.Revoked.Url2 as of M52. The
+    domain for which a Geolocation permission was revoked. Note: This metric is
+    recorded for more revocation actions as of 2016-04-01 (M51).
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_Geolocation.Revoked.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>jialiul@chromium.org</owner>
+  <summary>
+    The domain for which a Geolocation permission was revoked.
+  </summary>
+</rappor-metric>
+
 <rappor-metric name="ContentSettings.PermissionActions_Mic.Revoked.Url"
     type="ETLD_PLUS_ONE">
   <owner>jialiul@chromium.org</owner>
   <summary>
     **DEPRECATED. Renamed to
     ContentSettings.PermissionActions_AudioCapture.Revoked.Url on
     2016-01-07.** The domain for which a microphone permission was revoked.
   </summary>
 </rappor-metric>
 
 <rappor-metric
     name="ContentSettings.PermissionActions_Notifications.Denied.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Notifications.Denied.Url2 as of M52. The
+    domain for which a Notification permission prompt was Denied.
+  </summary>
+</rappor-metric>
+
+<rappor-metric
+    name="ContentSettings.PermissionActions_Notifications.Denied.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>jialiul@chromium.org</owner>
+  <summary>
     The domain for which a Notification permission prompt was Denied.
   </summary>
 </rappor-metric>
 
 <rappor-metric
     name="ContentSettings.PermissionActions_Notifications.Dismissed.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Notifications.Dismissed.Url2 as of M52.
+    The domain for which a Notification permission prompt was Dismissed.
+  </summary>
+</rappor-metric>
+
+<rappor-metric
+    name="ContentSettings.PermissionActions_Notifications.Dismissed.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>jialiul@chromium.org</owner>
+  <summary>
     The domain for which a Notification permission prompt was Dismissed.
   </summary>
 </rappor-metric>
 
 <rappor-metric
     name="ContentSettings.PermissionActions_Notifications.Granted.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Notifications.Granted.Url2 as of M52. The
+    domain for which a Notification permission prompt was accepted.
+  </summary>
+</rappor-metric>
+
+<rappor-metric
+    name="ContentSettings.PermissionActions_Notifications.Granted.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <summary>
     The domain for which a Notification permission prompt was accepted.
   </summary>
 </rappor-metric>
 
 <rappor-metric
     name="ContentSettings.PermissionActions_Notifications.Ignored.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Notifications.Ignored.Url2 as of M52. The
+    domain for which a Notification permission prompt was Ignored.
+  </summary>
+</rappor-metric>
+
+<rappor-metric
+    name="ContentSettings.PermissionActions_Notifications.Ignored.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <summary>
     The domain for which a Notification permission prompt was Ignored.
   </summary>
 </rappor-metric>
 
 <rappor-metric
     name="ContentSettings.PermissionActions_Notifications.Revoked.Url"
     type="ETLD_PLUS_ONE">
   <owner>jialiul@chromium.org</owner>
   <summary>
-    The domain for which a Notification permission was revoked. Note: This
-    metric is recorded for more revocation actions as of 2016-04-01 (M51).
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_Notifications.Revoked.Url2 as of M52. The
+    domain for which a Notification permission was revoked. Note: This metric
+    is recorded for more revocation actions as of 2016-04-01 (M51).
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_Notifications.Revoked.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>jialiul@chromium.org</owner>
+  <summary>
+    The domain for which a Notification permission was revoked.
+  </summary>
+</rappor-metric>
+
 <rappor-metric name="ContentSettings.PermissionActions_VideoCapture.Denied.Url"
     type="ETLD_PLUS_ONE">
   <owner>kcarattini@chromium.org</owner>
   <owner>miguelg@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which a VideoCapture permission prompt was Denied. Also
-    recorded as a multi-dimensional metric in Permissions.Action.VideoCapture.
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_VideoCapture.Denied.Url2 as of M52. The
+    domain for which a VideoCapture permission prompt was Denied.
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_VideoCapture.Denied.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>kcarattini@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which a VideoCapture permission prompt was Denied.
+  </summary>
+</rappor-metric>
+
 <rappor-metric
     name="ContentSettings.PermissionActions_VideoCapture.Dismissed.Url"
     type="ETLD_PLUS_ONE">
   <owner>kcarattini@chromium.org</owner>
   <owner>miguelg@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which a VideoCapture permission prompt was Dismissed. Also
-    recorded as a multi-dimensional metric in Permissions.Action.VideoCapture.
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_VideoCapture.Dismissed.Url2 as of M52. The
+    domain for which a VideoCapture permission prompt was Dismissed.
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_VideoCapture.Dismissed.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>kcarattini@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which a VideoCapture permission prompt was Dismissed.
+  </summary>
+</rappor-metric>
+
 <rappor-metric
     name="ContentSettings.PermissionActions_VideoCapture.Granted.Url"
     type="ETLD_PLUS_ONE">
   <owner>kcarattini@chromium.org</owner>
   <owner>miguelg@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which a VideoCapture permission prompt was accepted. Also
-    recorded as a multi-dimensional metric in Permissions.Action.VideoCapture.
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_VideoCapture.Granted.Url2 as of M52. The
+    domain for which a VideoCapture permission prompt was accepted.
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_VideoCapture.Granted.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>kcarattini@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which a VideoCapture permission prompt was accepted.
+  </summary>
+</rappor-metric>
+
 <rappor-metric
     name="ContentSettings.PermissionActions_VideoCapture.Ignored.Url"
     type="ETLD_PLUS_ONE">
   <owner>kcarattini@chromium.org</owner>
   <owner>miguelg@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which a VideoCapture permission prompt was Ignored. Also
-    recorded as a multi-dimensional metric in Permissions.Action.VideoCapture.
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_VideoCapture.Ignored.Url2 as of M52. The
+    domain for which a VideoCapture permission prompt was Ignored.
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_VideoCapture.Ignored.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>kcarattini@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which a VideoCapture permission prompt was Ignored.
+  </summary>
+</rappor-metric>
+
 <rappor-metric
     name="ContentSettings.PermissionActions_VideoCapture.Revoked.Url"
     type="ETLD_PLUS_ONE">
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain for which an VideoCapture permission was revoked. Also recorded
-    as a multi-dimensional metric in Permissions.Action.VideoCapture. Note: This
-    metric is recorded for more revocation actions as of 2016-04-01 (M51).
+    **DEPRECATED. Replaced by
+    ContentSettings.PermissionActions_VideoCapture.Revoked.Url2 as of M52. The
+    domain for which an VideoCapture permission was revoked. Note: This metric
+    is recorded for more revocation actions as of 2016-04-01 (M51).
   </summary>
 </rappor-metric>
 
+<rappor-metric
+    name="ContentSettings.PermissionActions_VideoCapture.Revoked.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
+  <summary>
+    The domain for which an VideoCapture permission was revoked.
+  </summary>
+</rappor-metric>
+
 <rappor-metric name="ContentSettings.PermissionRequested.Geolocation.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED: replaced by
+    ContentSettings.PermissionRequested.Geolocation.Url2 as of M52. The domain
+    that issues a Geolocation permission prompt.
+  </summary>
+</rappor-metric>
+
+<rappor-metric name="ContentSettings.PermissionRequested.Geolocation.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <summary>
     The domain that issues a Geolocation permission prompt.
   </summary>
 </rappor-metric>
 
 <rappor-metric name="ContentSettings.PermissionRequested.Notifications.Url"
     type="ETLD_PLUS_ONE">
   <owner>miguelg@chromium.org</owner>
   <summary>
+    **DEPRECATED: replaced by
+    ContentSettings.PermissionRequested.Notifications.Url2 as of M52. The
+    domain that issues a Notification permission prompt.
+  </summary>
+</rappor-metric>
+
+<rappor-metric name="ContentSettings.PermissionRequested.Notifications.Url2"
+    type="LOW_FREQUENCY_ETLD_PLUS_ONE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>miguelg@chromium.org</owner>
+  <summary>
     The domain that issues a Notification permission prompt.
   </summary>
 </rappor-metric>
 
 <rappor-metric name="CustomTabs.ServiceClient.PackageName"
     type="UMA_RAPPOR_TYPE">
   <owner>yusufo@chromium.org</owner>
   <summary>
     The package name for a client that has connected through the custom tabs
     service.
@@ skipping 263 matching lines @@
       to de-noise than this one.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="Permissions.Action.AudioCapture"
     type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>kcarattini@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that requested the MediaStream Microphone API.
+    **DEPRECATED. No longer reported as of M52. The domain+registry of a URL
+    that requested the MediaStream Microphone API.
   </summary>
   <string-field name="Scheme">
     <summary>
       The scheme of a URL that requested a permission.
     </summary>
   </string-field>
   <string-field name="Host">
     <summary>
       The host of a URL that requested a permission.
     </summary>
@@ skipping 19 matching lines @@
     <summary>
       Bitfield of the permission actions taken for this permission.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="Permissions.Action.DurableStorage"
     type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>kcarattini@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that requested the Durable Storage API.
+    **DEPRECATED. No longer reported as of M52. The domain+registry of a URL
+    that requested the Durable Storage API.
   </summary>
   <string-field name="Scheme">
     <summary>
       The scheme of a URL that requested a permission.
     </summary>
   </string-field>
   <string-field name="Host">
     <summary>
       The host of a URL that requested a permission.
     </summary>
@@ skipping 19 matching lines @@
     <summary>
       Bitfield of the permission actions taken for this permission.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="Permissions.Action.Geolocation"
     type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>kcarattini@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that requested the Geolocation API.
+    **DEPRECATED. No longer reported as of M52. The domain+registry of a URL
+    that requested the Geolocation API.
   </summary>
   <string-field name="Scheme">
     <summary>
       The scheme of a URL that requested a permission.
     </summary>
   </string-field>
   <string-field name="Host">
     <summary>
       The host of a URL that requested a permission.
     </summary>
@@ skipping 19 matching lines @@
     <summary>
       Bitfield of the permission actions taken for this permission.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="Permissions.Action.MidiSysEx"
     type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>kcarattini@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that requested the MidiSysEx API.
+    **DEPRECATED. No longer reported as of M52. The domain+registry of a URL
+    that     requested the MidiSysEx API.
   </summary>
   <string-field name="Scheme">
     <summary>
       The scheme of a URL that requested a permission.
     </summary>
   </string-field>
   <string-field name="Host">
     <summary>
       The host of a URL that requested a permission.
     </summary>
@@ skipping 19 matching lines @@
     <summary>
       Bitfield of the permission actions taken for this permission.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="Permissions.Action.Notifications"
     type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>kcarattini@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that requested the Notifications API.
+    **DEPRECATED. No longer reported as of M52. The domain+registry of a URL
+    that requested the Notifications API.
   </summary>
   <string-field name="Scheme">
     <summary>
       The scheme of a URL that requested a permission.
     </summary>
   </string-field>
   <string-field name="Host">
     <summary>
       The host of a URL that requested a permission.
     </summary>
@@ skipping 19 matching lines @@
     <summary>
       Bitfield of the permission actions taken for this permission.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="Permissions.Action.ProtectedMediaIdentifier"
     type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>kcarattini@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that requested the ProtectedMediaIdentifier
-    API.
+    **DEPRECATED. No longer reported as of M52. The domain+registry of a URL
+    that requested the ProtectedMediaIdentifier API.
   </summary>
   <string-field name="Scheme">
     <summary>
       The scheme of a URL that requested a permission.
     </summary>
   </string-field>
   <string-field name="Host">
     <summary>
       The host of a URL that requested a permission.
     </summary>
@@ skipping 19 matching lines @@
     <summary>
       Bitfield of the permission actions taken for this permission.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="Permissions.Action.PushMessaging"
     type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>kcarattini@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that requested the PushMessaging API.
+    **DEPRECATED. No longer reported as of M52. The domain+registry of a URL
+    that requested the PushMessaging API.
   </summary>
   <string-field name="Scheme">
     <summary>
       The scheme of a URL that requested a permission.
     </summary>
   </string-field>
   <string-field name="Host">
     <summary>
       The host of a URL that requested a permission.
     </summary>
@@ skipping 20 matching lines @@
       Bitfield of the permission actions taken for this permission.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="Permissions.Action.VideoCapture"
     type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>kcarattini@chromium.org</owner>
   <owner>tsergeant@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that requested the MediaStream Camera API.
+    **DEPRECATED. No longer reported as of M52. The domain+registry of a URL
+    that requested the MediaStream Camera API.
   </summary>
   <string-field name="Scheme">
     <summary>
       The scheme of a URL that requested a permission.
     </summary>
   </string-field>
   <string-field name="Host">
     <summary>
       The host of a URL that requested a permission.
     </summary>
@@ skipping 343 matching lines @@
 </rappor-metric>
 
 <rappor-metric name="interstitial.harmful" type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>nparker@chromium.org</owner>
   <summary>
     The domain+registry of a URL that triggered a safe-browsing UWS
     interstitial.
   </summary>
   <string-field name="domain">
     <summary>
+      **DEPRECATED: replaced by interstitial.harmful2 as of M52. The
+      domain+registry of a URL that triggered a safe-browsing UWS
+      interstitial.
+    </summary>
+  </string-field>
+  <flags-field name="flags">
+    <flag>Bit 0: DID_PROCEED</flag>
+    <flag>Bit 1: IS_REPEAT_VISIT</flag>
+    <summary>
+      Bitfield of the state from a safe-browsing UWS warning interstitial.
+    </summary>
+  </flags-field>
+</rappor-metric>
+
+<rappor-metric name="interstitial.harmful2"
+    type="LOW_FREQUENCY_SAFEBROWSING_RAPPOR_TYPE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>nparker@chromium.org</owner>
+  <summary>
+    The domain+registry of a URL that triggered a safe-browsing UWS
+    interstitial.
+  </summary>
+  <string-field name="domain">
+    <summary>
       The domain+registry of a URL that triggered a safe-browsing UWS
       interstitial.
     </summary>
   </string-field>
   <flags-field name="flags">
     <flag>Bit 0: DID_PROCEED</flag>
     <flag>Bit 1: IS_REPEAT_VISIT</flag>
     <summary>
       Bitfield of the state from a safe-browsing UWS warning interstitial.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="interstitial.malware" type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>nparker@chromium.org</owner>
   <summary>
+    **DEPRECATED: replaced by interstitial.malware2 as of M52. The
+    domain+registry of a URL that triggered a safe-browsing malware
+    interstitial.
+  </summary>
+  <string-field name="domain">
+    <summary>
+      The domain+registry of a URL that triggered a safe-browsing malware
+      interstitial.
+    </summary>
+  </string-field>
+  <flags-field name="flags">
+    <flag>Bit 0: DID_PROCEED</flag>
+    <flag>Bit 1: IS_REPEAT_VISIT</flag>
+    <summary>
+      Bitfield of the state from a safe-browsing malware warning interstitial.
+    </summary>
+  </flags-field>
+</rappor-metric>
+
+<rappor-metric name="interstitial.malware2"
+    type="LOW_FREQUENCY_SAFEBROWSING_RAPPOR_TYPE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>nparker@chromium.org</owner>
+  <summary>
     The domain+registry of a URL that triggered a safe-browsing malware
     interstitial.
   </summary>
   <string-field name="domain">
     <summary>
       The domain+registry of a URL that triggered a safe-browsing malware
       interstitial.
     </summary>
   </string-field>
   <flags-field name="flags">
     <flag>Bit 0: DID_PROCEED</flag>
     <flag>Bit 1: IS_REPEAT_VISIT</flag>
     <summary>
       Bitfield of the state from a safe-browsing malware warning interstitial.
     </summary>
   </flags-field>
 </rappor-metric>
 
 <rappor-metric name="interstitial.phishing" type="SAFEBROWSING_RAPPOR_TYPE">
   <owner>nparker@chromium.org</owner>
   <summary>
+    **DEPRECATED: replaced by interstitial.phishing2 as of M52. The
+    domain+registry of a URL that triggered a safe-browsing phishing
+    interstitial.
+  </summary>
+  <string-field name="domain">
+    <summary>
+      The domain+registry of a URL that triggered a safe-browsing phishing
+      interstitial.
+    </summary>
+  </string-field>
+  <flags-field name="flags">
+    <flag>Bit 0: DID_PROCEED</flag>
+    <flag>Bit 1: IS_REPEAT_VISIT</flag>
+    <summary>
+      Bitfield of the state from a safe-browsing phishing warning interstitial.
+    </summary>
+  </flags-field>
+</rappor-metric>
+
+<rappor-metric name="interstitial.phishing2"
+    type="LOW_FREQUENCY_SAFEBROWSING_RAPPOR_TYPE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>nparker@chromium.org</owner>
+  <summary>
     The domain+registry of a URL that triggered a safe-browsing phishing
     interstitial.
   </summary>
   <string-field name="domain">
     <summary>
       The domain+registry of a URL that triggered a safe-browsing phishing
       interstitial.
     </summary>
   </string-field>
   <flags-field name="flags">
@@ skipping 10 matching lines @@
   <summary>
     ** DEPRECATED.  Replaced by insterstitial.ssl2.domain on 2015-07-07 since
     the type changed.**  The domain+registry of a URL that triggered an SSL
     interstitial.  Domains for bad-clock warnings are not reported.
   </summary>
 </rappor-metric>
 
 <rappor-metric name="interstitial.ssl2" type="UMA_RAPPOR_TYPE">
   <owner>nparker@chromium.org</owner>
   <summary>
+    **DEPRECATED: replaced by interstitial.ssl2 as of M52. The domain+registry
+    of a URL that triggered an SSL interstitial.
+  </summary>
+  <string-field name="domain">
+    <summary>
+      The domain+registry of a URL that triggered an SSL interstitial.
+    </summary>
+  </string-field>
+  <flags-field name="flags">
+    <flag>Bit 0: DID_PROCEED</flag>
+    <flag>Bit 1: IS_REPEAT_VISIT</flag>
+    <summary>
+      Bitfield of the state from an SSL warning interstitial.
+    </summary>
+  </flags-field>
+</rappor-metric>
+
+<rappor-metric name="interstitial.ssl3" type="LOW_FREQUENCY_UMA_RAPPOR_TYPE">
+  <owner>dominickn@chromium.org</owner>
+  <owner>nparker@chromium.org</owner>
+  <summary>
     The domain+registry of a URL that triggered an SSL interstitial.
   </summary>
   <string-field name="domain">
     <summary>
       The domain+registry of a URL that triggered an SSL interstitial.
     </summary>
   </string-field>
   <flags-field name="flags">
     <flag>Bit 0: DID_PROCEED</flag>
     <flag>Bit 1: IS_REPEAT_VISIT</flag>
     <summary>
       Bitfield of the state from an SSL warning interstitial.
     </summary>
   </flags-field>
 </rappor-metric>
 
 </rappor-metrics>
 
 </rappor-configuration>