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 e298f0aa7a6ca089a36329a6f6094b92b6cf6e86..c10d3b1c008a9511037e43b46f7649226561f491 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -10434,6 +10434,45 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="interstitial.malware.decision" enum="SB3InterstitialDecision">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    User decision when presented with a Safe Browsing malware interstitial.
+  </summary>
+</histogram>
+
+<histogram name="interstitial.malware.interaction"
+    enum="SB3InterstitialInteraction">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    User interactions with a Safe Browsing malware interstitial.
+  </summary>
+</histogram>
+
+<histogram name="interstitial.malware.repeat_visit_decision"

[Alexei Svitkine (slow), 2014/09/16 17:30:56]

How about naming this interstitial.malware.decision.repeat_visit to indicate
it's a specialization of the other histogram.

[felt, 2014/09/16 20:34:56]

Done.

+    enum="SB3InterstitialDecision">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    User decision when presented with a Safe Browsing malware interstitial for a
+    website that the user has visited before.
+  </summary>
+</histogram>
+
+<histogram name="interstitial.phishing.decision" enum="SB3InterstitialDecision">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    User decision when presented with a Safe Browsing phishing interstitial.
+  </summary>
+</histogram>
+
+<histogram name="interstitial.phishing.interaction"
+    enum="SB3InterstitialInteraction">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    User interactions with a Safe Browsing phishing interstitial.
+  </summary>
+</histogram>
+
 <histogram name="interstitial.ssl" enum="SSLResponseTypesV2">
   <owner>felt@chromium.org</owner>
   <summary>
@@ -27372,6 +27411,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="SB2.InterstitialAction" enum="SB2InterstitialAction">
+  <obsolete>
+    Deprecated, replaced by: interstitial.malware.* and interstitial.phishing.*.
+  </obsolete>
   <owner>felt@chromium.org</owner>
   <summary>
     Track number of times Safe Browsing interstitials have been shown, and how
@@ -27381,6 +27423,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 
 <histogram name="SB2.InterstitialActionDetails"
     enum="SB2InterstitialActionDetails">
+  <obsolete>
+    Deprecated, replaced by: interstitial.malware.* and interstitial.phishing.*.
+  </obsolete>
   <owner>felt@chromium.org</owner>
   <summary>
     Tracks the click-through rate for specific cases of the interstitial.
@@ -49128,6 +49173,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 </enum>
 
 <enum name="SB2InterstitialAction" type="int">
+  <obsolete>
+    Deprecated 9/2014.
+  </obsolete>
   <int value="0" label="MALWARE_SHOW"/>
   <int value="1" label="MALWARE_DONT_PROCEED"/>
   <int value="2" label="MALWARE_FORCED_DONT_PROCEED"/>
@@ -49146,6 +49194,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 </enum>
 
 <enum name="SB2InterstitialActionDetails" type="int">
+  <obsolete>
+    Deprecated 9/2014.
+  </obsolete>
   <int value="0" label="MALWARE_SHOW_NEW_SITE"/>
   <int value="1" label="MALWARE_PROCEED_NEW_SITE"/>
   <int value="2" label="MALWARE_SHOW_CROSS_SITE"/>
@@ -49198,6 +49249,20 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="7" label="BACKUP_NETWORK_SUCCESS"/>
 </enum>
 
+<enum name="SB3InterstitialDecision" type="int">
+  <int value="0" label="SHOW"/>
+  <int value="1" label="PROCEED"/>
+  <int value="2" label="DONT_PROCEED"/>
+  <int value="3" label="PROCEEDING_DISABLED"/>
+</enum>
+
+<enum name="SB3InterstitialInteraction" type="int">
+  <int value="0" label="SHOW_ADVANCED"/>

[Alexei Svitkine (slow), 2014/09/16 17:30:56]

I'm not sure how useful this enum is without a normalizing value (e.g. number of
times the interstitial was shown). Perhaps add an entry here for it like you
have for decision?

[felt, 2014/09/16 20:34:56]

The normalizing value is SB3InterstitialDecision::SHOW. It'll be the same value.
Should I repeat it anyway?

[Alexei Svitkine (slow), 2014/09/16 21:05:00]

Right. But in the current set up, you have to look at another histogram to get
that normalizing value. So it's up to you - if you feel that inconvenience can
be lived with, then you can leave as is (but maybe mention it in the histogram
description). Otherwise you could also include it in this one, to make the
histogram stand on its own.

+  <int value="1" label="SHOW_PRIVACY"/>
+  <int value="2" label="SHOW_DIAGNOSTIC"/>
+  <int value="3" label="SHOW_LEARN_MORE"/>
+</enum>
+
 <enum name="SBClientDetectionPreClassificationCheckFail" type="int">
   <int value="0" label="PROXY_FETCH"/>
   <int value="1" label="PRIVATE_IP"/>