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..eecb456ac6ea55ed263162cac805e0d5d7068ca4 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 SetDefaultBrowser.AsyncDuration.
+  </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 SetDefaultBrowser.Result.
+  </obsolete>
   <owner>pmonette@chromium.org</owner>
   <summary>
     The count of how many times users were successfully able to set Chrome as
@@ -6308,6 +6314,14 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </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.InteractionResult"
     enum="MakeChromeDefaultResult">
   <owner>gab@chromium.org</owner>
@@ -6332,6 +6346,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="DefaultBrowserWarning.Ignored" enum="BooleanHit">

[grt (UTC plus 2), 2015/11/03 21:12:22]

the following are also obsolete, right?
- DefaultBrowserWarning.SetAsDefaultUI
- DefaultBrowserWarning.SetAsDefault
- DefaultBrowserWarning.DontSetAsDefault
- DefaultBrowserWarning.SetAsDefaultUIFailed

[Patrick Monette, 2015/11/10 19:22:47]

Yes. Added.

+  <obsolete>
+    Deprecated 2015/11. Renamed to SetDefaultBrowser.InfoBar.Ignored.
+  </obsolete>
   <owner>gab@chromium.org</owner>
   <summary>
     The user ignored the make-default infobar (it was eventually dismissed along
@@ -41708,6 +41725,32 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="SetDefaultBrowser.AsyncDuration" 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="SetDefaultBrowser.Location" enum="SetDefaultBrowserLocation">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    The locations from which the user attempted to set Chrome as the default
+    browser.
+  </summary>
+</histogram>
+
+<histogram name="SetDefaultBrowser.Result"
+    enum="SetDefaultBrowserAttemptResult">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    The count of how many times users were successfully able to set Chrome as
+    the default browser asynchronously in Windows 10+.
+  </summary>
+</histogram>
+
 <histogram name="Settings.DefaultSearchProvider" enum="OmniboxSearchEngine">
   <obsolete>
     Deprecated in Chrome 30.  Use Search.DefaultSearchProviderType instead.
@@ -55680,6 +55723,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 SetDefaultBrowserAttemptResult.
+  </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 +71961,44 @@ To add a new entry, add it with any value and run test to compute valid value.
   </int>
 </enum>
 
+<enum name="SetDefaultBrowserAttemptResult" type="int">
+  <int value="0" label="Success">Chrome was set as the default browser.</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 browser.
+  </int>
+</enum>
+
+<enum name="SetDefaultBrowserLocation" type="int">
+  <int value="0" label="Info Bar">
+    The user clicked &quot;Set as default&quot; on the info bar.
+  </int>
+  <int value="1" label="Settings">
+    The user clicked &quot;Make Chrome the default browser&quot; in the settings
+    page.
+  </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 +75745,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 +75755,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="SetDefaultBrowser.AsyncDuration"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="AutofillDataAvailability" separator=".">
   <suffix name="WithNoData" label="no autofill data"/>
   <suffix name="WithOnlyServerData" label="only server autofill data"/>