tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index f6a3aa9a7c846f867e1938c5f5fa3dfc50f86021..a4852d2355d25c876a73e4cb2feeb1642e234e3d 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -46045,25 +46045,17 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="Permissions.AutoBlocker.SafeBrowsingResponse"

[raymes, 2017/02/13 05:00:58]

Let's fix the bad merge :)

[dominickn, 2017/02/13 05:24:47]

Done.

-    enum="SafeBrowsingResponse">
+<histogram name="Permissions.AutoBlocker.EmbargoStatus"
+    enum="PermissionEmbargoStatus">
   <owner>dominickn@chromium.org</owner>
   <owner>kcarattini@chromium.org</owner>
   <summary>
-    Tracks the response (if received) from Safe Browsing when the API blacklist
-    is queried for an (origin, permission) pair. The response could be that the
-    origin was blacklisted, not blacklisted, or Safe Browsing timed out before a
-    response was received.
-  </summary>
-</histogram>
-
-<histogram name="Permissions.AutoBlocker.SafeBrowsingResponseTime" units="ms">
-  <owner>dominickn@chromium.org</owner>
-  <owner>kcarattini@chromium.org</owner>
-  <summary>
-    Records the elapsed time between the client sending a request to Safe
-    Browsing and receiving a result, or the maximum wait time is exceeded and
-    Safe Browsing is deemed to have timed out.
+    Tracks the reason that an (origin, permission) pair has been placed under
+    embargo (blocked from making requests for that permission for a period of
+    time). This is triggered when a permission is placed under embargo for
+    blacklisting (once Safe Browsing has returned a result), when a permission
+    prompt has been shown and it is placed under embargo for repeated
+    dismissals, or when a permission prompt is shown and not embargoed.
   </summary>
 </histogram>
 
@@ -102339,6 +102331,12 @@ value.
   <int value="4" label="REVOKED"/>
 </enum>
 
+<enum name="PermissionEmbargoStatus" type="int">
+  <int value="0" label="NOT_EMBARGOED"/>
+  <int value="1" label="BLACKLISTED"/>
+  <int value="2" label="REPEATED_DISMISSALS"/>
+</enum>
+
 <enum name="PermissionRequestType" type="int">
   <int value="0" label="PERMISSION_BUBBLE_UNKNOWN"/>
   <int value="1" label="PERMISSION_BUBBLE_MULTIPLE"/>