Remove redundancy in security interstitial UMA logic

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 58f95dfe849b4920779e09316a7be190695876a4..93077bf54d91ec4d5c1702f12fde2cbdae96c125 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -11325,6 +11325,22 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="interstitial.bad_clock.decision"
+    enum="SecurityInterstitialDecision">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    User decision when presented with an SSL interstitial caused by a bad clock.
+  </summary>
+</histogram>
+
+<histogram name="interstitial.bad_clock.interaction"
+    enum="SecurityInterstitialInteraction">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    User interactions with an SSL interstitial caused by a bad clock.
+  </summary>
+</histogram>
+
 <histogram name="interstitial.captive_portal"
     enum="CaptivePortalBlockingPageEvent">
   <owner>meacer@chromium.org</owner>
@@ -11359,7 +11375,8 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
-<histogram name="interstitial.harmful.decision" enum="SB3InterstitialDecision">
+<histogram name="interstitial.harmful.decision"
+    enum="SecurityInterstitialDecision">
   <owner>felt@chromium.org</owner>
   <summary>
     User decision when presented with a Safe Browsing harmful program
@@ -11368,14 +11385,15 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="interstitial.harmful.interaction"
-    enum="SB3InterstitialInteraction">
+    enum="SecurityInterstitialInteraction">
   <owner>felt@chromium.org</owner>
   <summary>
     User interactions with a Safe Browsing harmful program interstitial.
   </summary>
 </histogram>
 
-<histogram name="interstitial.malware.decision" enum="SB3InterstitialDecision">
+<histogram name="interstitial.malware.decision"
+    enum="SecurityInterstitialDecision">
   <owner>felt@chromium.org</owner>
   <summary>
     User decision when presented with a Safe Browsing malware interstitial.
@@ -11383,7 +11401,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="interstitial.malware.decision.repeat_visit"
-    enum="SB3InterstitialDecision">
+    enum="SecurityInterstitialDecision">
   <owner>felt@chromium.org</owner>
   <summary>
     User decision when presented with a Safe Browsing malware interstitial for a
@@ -11392,14 +11410,15 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="interstitial.malware.interaction"
-    enum="SB3InterstitialInteraction">
+    enum="SecurityInterstitialInteraction">
   <owner>felt@chromium.org</owner>
   <summary>
     User interactions with a Safe Browsing malware interstitial.
   </summary>
 </histogram>
 
-<histogram name="interstitial.phishing.decision" enum="SB3InterstitialDecision">
+<histogram name="interstitial.phishing.decision"
+    enum="SecurityInterstitialDecision">
   <owner>felt@chromium.org</owner>
   <summary>
     User decision when presented with a Safe Browsing phishing interstitial.
@@ -11407,7 +11426,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="interstitial.phishing.interaction"
-    enum="SB3InterstitialInteraction">
+    enum="SecurityInterstitialInteraction">
   <owner>felt@chromium.org</owner>
   <summary>
     User interactions with a Safe Browsing phishing interstitial.
@@ -11415,6 +11434,10 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="interstitial.ssl" enum="SSLResponseTypesV2">
+  <obsolete>
+    Replaced by interstitial.ssl_overridable.* and
+    interstitial.ssl_nonoverridable.* in Jan 2015 (M42).
+  </obsolete>
   <owner>felt@chromium.org</owner>
   <summary>
     User action when the user is shown a SSL interstitial. SHOW_ALL and MORE
@@ -11547,6 +11570,34 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="interstitial.ssl_nonoverridable.decision"
+    enum="SecurityInterstitialDecision">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    User decision when presented with a non-overridable SSL interstitial.
+  </summary>
+</histogram>
+
+<histogram name="interstitial.ssl_nonoverridable.interaction"
+    enum="SecurityInterstitialInteraction">
+  <owner>felt@chromium.org</owner>
+  <summary>User interactions with a non-overridable SSL interstitial.</summary>
+</histogram>
+
+<histogram name="interstitial.ssl_overridable.decision"
+    enum="SecurityInterstitialDecision">
+  <owner>felt@chromium.org</owner>
+  <summary>
+    User decision when presented with an overridable SSL interstitial.
+  </summary>
+</histogram>
+
+<histogram name="interstitial.ssl_overridable.interaction"

[Alexei Svitkine (slow), 2015/01/14 22:12:33]

Consider using histogram_suffixes XML construct (see examples in this file) to
specify the decision and interaction suffixes for all of these histograms.

[felt, 2015/01/15 06:47:22]

If I do something like:

<histogram_suffixes name="SecurityInterstitialType" ordering="prefix">
  <suffix name="malware"/>
  <suffix name="phishing"/>
  <suffix name="ssl_nonoverridable"/>
  <suffix name="ssl_overridable"/>
  <affected-histogram name="interstitial..decision"/>
  <affected-histogram name="interstitial..interaction"/>
</histogram_suffixes>

Will that generate interstitial.malware.decision? Or will it yield
interstitial.malware_.decision? I'm asking because the malware and phishing ones
already exist in the format interstitial.malware.decision (without the "_").

[Alexei Svitkine (slow), 2015/01/16 22:14:20]

I believe you can specify separator="." to use a dot instead of a _.

So you can specify interstitial.interaction in your above example.

[felt, 2015/01/17 00:32:49]

Done.

+    enum="SecurityInterstitialInteraction">
+  <owner>felt@chromium.org</owner>
+  <summary>User interactions with an overridable SSL interstitial.</summary>
+</histogram>
+
 <histogram name="interstitial.ssl_reject_time" units="milliseconds">
   <obsolete>
     Removed on 8/1/13.
@@ -55580,21 +55631,6 @@ 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="TOTAL_VISITS"/>
-  <int value="1" label="SHOW_ADVANCED"/>
-  <int value="2" label="SHOW_PRIVACY"/>
-  <int value="3" label="SHOW_DIAGNOSTIC"/>
-  <int value="4" label="SHOW_LEARN_MORE"/>
-</enum>
-
 <enum name="SBClientDetectionPreClassificationCheckFail" type="int">
   <int value="0" label="PROXY_FETCH"/>
   <int value="1" label="PRIVATE_IP"/>
@@ -55903,6 +55939,23 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="33" label="NONE"/>
 </enum>
 
+<enum name="SecurityInterstitialDecision" 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="SecurityInterstitialInteraction" type="int">
+  <int value="0" label="TOTAL_VISITS"/>
+  <int value="1" label="SHOW_ADVANCED"/>
+  <int value="2" label="SHOW_PRIVACY"/>
+  <int value="3" label="SHOW_DIAGNOSTIC"/>
+  <int value="4" label="SHOW_LEARN_MORE"/>
+  <int value="5" label="RELOAD"/>
+  <int value="6" label="OPEN_TIME_SETTINGS"/>
+</enum>
+
 <enum name="ServiceProcessEventType" type="int">
   <int value="0" label="SERVICE_EVENT_INITIALIZE"/>
   <int value="1" label="SERVICE_EVENT_ENABLED_ON_LAUNCH"/>