Make the histograms for setting the default browser consistent

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 b7dc4b061ea6d2b4b1a840df05526ce4e861dcff..39aa6c1b2884b35920dbb1c2a9cc571fb77b9a3e 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -6291,6 +6291,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="DefaultBrowser.AsyncSetAsDefault.Duration"
     units="milliseconds">
+  <obsolete>
+    Deprecated 2015/11. Renamed to DefaultBrowser.SetDefaultAsyncDuration.
+  </obsolete>
   <owner>pmonette@chromium.org</owner>
   <summary>
     How long it took to set Chrome as the default browser asynchronously in
@@ -6301,6 +6304,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="DefaultBrowser.AsyncSetAsDefault.Result"
     enum="DefaultBrowserAsyncAttemptResult">
+  <obsolete>
+    Deprecated 2015/11. Renamed to DefaultBrowser.SetDefaultResult.
+  </obsolete>
   <owner>pmonette@chromium.org</owner>
   <summary>
     The count of how many times users were successfully able to set Chrome as
@@ -6308,6 +6314,29 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="DefaultBrowser.InfoBar.DontAskAgain" enum="BooleanHit">

[rkaplow, 2015/11/13 15:56:14]

sorry, one more thing I'm noticing now. You have these 3 seperate histograms for
tracking what happens on the Infobar. Normally in this pattern we have one
histogram, with an enum for each option - this way it is easy to see, say, the %
of Ignored.

Is there a particular reason you wanted seperate histograms for the 3 options?
Looks like historically it was this way, but looks to me like it would be
cleaner putting in one histogram. Let me know if I am missing something.

[Patrick Monette, 2015/11/16 17:29:05]

Done.

+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    The user clicked &quot;Don't ask again&quot; on the default browser info
+    bar.
+  </summary>
+</histogram>
+
+<histogram name="DefaultBrowser.InfoBar.Ignored" enum="BooleanHit">
+  <owner>gab@chromium.org</owner>
+  <summary>
+    The user ignored the make-default infobar (it was eventually dismissed along
+    with its associated web content without the user interacting with it).
+  </summary>
+</histogram>
+
+<histogram name="DefaultBrowser.InfoBar.StartSetAsDefault" enum="BooleanHit">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    The user clicked &quot;Set as default&quot; on the default browser info bar.
+  </summary>
+</histogram>
+
 <histogram name="DefaultBrowser.InteractionResult"
     enum="MakeChromeDefaultResult">
   <owner>gab@chromium.org</owner>
@@ -6316,12 +6345,33 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="DefaultBrowser.SetDefaultAsyncDuration" units="milliseconds">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    How long it took to set Chrome as the default browser asynchronously in
+    Windows 10+. The duration is recorded only on Success, Failure, Abandoned,
+    Retry and NoErrorsNotDefault result codes.
+  </summary>
+</histogram>
+
+<histogram name="DefaultBrowser.SetDefaultResult"
+    enum="SetDefaultAttemptResult">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    The outcome of an attempt to set Chrome as the user's default browser.
+  </summary>
+</histogram>
+
 <histogram name="DefaultBrowser.State" enum="DefaultBrowserState">
   <owner>gab@chromium.org</owner>
   <summary>Whether Chrome was the default browser when it started up.</summary>
 </histogram>
 
 <histogram name="DefaultBrowserWarning.DontSetAsDefault" enum="BooleanHit">
+  <obsolete>
+    Deprecated 2015/11. The same information is available as the value Failure
+    in DefaultBrowser.SetDefaultResult.
+  </obsolete>
   <owner>gab@chromium.org</owner>
   <summary>
     In the make-default infobar, the user explicitly declined to set Chrome as
@@ -6332,6 +6382,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="DefaultBrowserWarning.Ignored" enum="BooleanHit">
+  <obsolete>
+    Deprecated 2015/11. Renamed to DefaultBrowser.InfoBar.Ignored.
+  </obsolete>
   <owner>gab@chromium.org</owner>
   <summary>
     The user ignored the make-default infobar (it was eventually dismissed along
@@ -6340,6 +6393,10 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="DefaultBrowserWarning.SetAsDefault" enum="BooleanHit">
+  <obsolete>
+    Deprecated 2015/11. Renamed to DefaultBrowser.Infobar.StartSetAsDefault.
+    There is no longer a distinction between interactive or not.
+  </obsolete>
   <owner>gab@chromium.org</owner>
   <summary>
     In the make-default infobar, the user clicked a button making Chrome the
@@ -6348,6 +6405,10 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="DefaultBrowserWarning.SetAsDefaultUI" enum="BooleanHit">
+  <obsolete>
+    Deprecated 2015/11. Renamed to DefaultBrowser.Infobar.StartSetAsDefault.
+    There is no longer a distinction between interactive or not.
+  </obsolete>
   <owner>gab@chromium.org</owner>
   <summary>
     Same as SetAsDefault, but in Win8+ (resulting in interactive UI instead of
@@ -6358,6 +6419,10 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="DefaultBrowserWarning.SetAsDefaultUIFailed" enum="BooleanHit">
+  <obsolete>
+    Deprecated 2015/11. The same information is available as the value Failure
+    in DefaultBrowser.SetDefaultResult.
+  </obsolete>
   <owner>gab@chromium.org</owner>
   <summary>
     The user dismissed the interactive SetAsDefaultUI without making an explicit
@@ -6365,6 +6430,15 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="DefaultProtocolClient.SetDefaultResult"
+    enum="SetDefaultAttemptResult">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    The outcome of an attempt to set Chrome as the user's default client for a
+    protocol.
+  </summary>
+</histogram>
+
 <histogram name="DevTools.ActionTaken" enum="DevToolsAction">
   <owner>sergeyv@chromium.org</owner>
   <owner>vsevik@chromium.org</owner>
@@ -41905,6 +41979,14 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="Settings.StartSetAsDefault" enum="BooleanHit">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    The user clicked &quot;Make Google Chrome the default browser&quot; on the
+    settings page.
+  </summary>
+</histogram>
+
 <histogram name="Settings.StartupPageDomains" enum="OmniboxSearchEngine">
   <obsolete>
     Deprecated in Chrome 30.  Replaced by Settings.StartupPageEngineTypes.
@@ -55680,6 +55762,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </enum>
 
 <enum name="DefaultBrowserAsyncAttemptResult" type="int">
+  <obsolete>
+    Deprecated 2015/11. Renamed to SetDefaultAttemptResult.
+  </obsolete>
   <int value="0" label="Success">No errors encountered.</int>
   <int value="1" label="Already default">
     Chrome was already the default web client. This counts as a successful
@@ -71915,6 +72000,34 @@ To add a new entry, add it with any value and run test to compute valid value.
   </int>
 </enum>
 
+<enum name="SetDefaultAttemptResult" type="int">
+  <int value="0" label="Success">Chrome was set as the default web client.</int>
+  <int value="1" label="Already default">
+    Chrome was already the default web client. This counts as a successful
+    attempt.
+  </int>
+  <int value="2" label="Failure">
+    Chrome was not set as the default web client.
+  </int>
+  <int value="3" label="Abandoned">
+    The attempt was abandoned because the observer was destroyed.
+  </int>
+  <int value="4" label="Launch failure">
+    Failed to launch the process to set Chrome as the default web client
+    asynchronously.
+  </int>
+  <int value="5" label="Other worker">
+    Another worker is already in progress to make Chrome the default web client.
+  </int>
+  <int value="6" label="Retry">
+    The user initiated another attempt while the asynchronous operation was
+    already in progress.
+  </int>
+  <int value="7" label="No errors, not default">
+    No errors were encountered yet Chrome is still not the default web client.
+  </int>
+</enum>
+
 <enum name="SHA1Status" type="int">
   <summary>
     Whether or not SHA-1 was present in a certificate chain and, if it was, when
@@ -75661,6 +75774,9 @@ To add a new entry, add it with any value and run test to compute valid value.
 </histogram_suffixes>
 
 <histogram_suffixes name="AttemptResultCode">
+  <obsolete>
+    Deprecated 2015/11. Renamed to AttemptResultCode2.
+  </obsolete>
   <suffix name="Success"/>
   <suffix name="Failure"/>
   <suffix name="Abandoned"/>
@@ -75668,6 +75784,15 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="DefaultBrowser.AsyncSetAsDefault.Duration"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="AttemptResultCode2">
+  <suffix name="Success"/>
+  <suffix name="Failure"/>
+  <suffix name="Abandoned"/>
+  <suffix name="Retry"/>
+  <suffix name="NoErrorsNotDefault"/>
+  <affected-histogram name="DefaultBrowser.SetDefaultAsyncDuration"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="AutofillDataAvailability" separator=".">
   <suffix name="WithNoData" label="no autofill data"/>
   <suffix name="WithOnlyServerData" label="only server autofill data"/>