[Password Manager] Add UMA stats for custom passphrase users.

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 dd89b52f6e84b34323b6c4b3884c4ed45bea44c8..d55c27556fc2d20fdaf26774294f0f4ad91bc053 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -21870,14 +21870,35 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="PasswordManager.AccountsPerSite">
-  <owner>dubroy@chromium.org</owner>
+  <owner>gcasto@chromium.org</owner>
   <owner>vabr@chromium.org</owner>
+  <obsolete>
+    Deprecated as of Chrome 40. See AccountsPerSiteWithoutCustomPassphrase.
+  </obsolete>
   <summary>
     The number of accounts stored per site in the password manager (one event
     per site)
   </summary>
 </histogram>
 
+<histogram name="PasswordManager.AccountsPerSiteWithCustomPassphrase">
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
+    Same as AccountsPerSite except distribution only includes users that are
+    syncing with custom passphrase encryption.
+  </summary>
+</histogram>
+
+<histogram name="PasswordManager.AccountsPerSiteWithoutCustomPassphrase">
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
+    The number of accounts stored per site in the password manager (one event
+    per site). Excludes custom passphrase users.
+  </summary>
+</histogram>
+
 <histogram name="PasswordManager.ActionsTaken"
     enum="PasswordManagerActionsTaken">
   <obsolete>
@@ -21917,7 +21938,10 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="PasswordManager.BlacklistedSites">
-  <owner>dubroy@chromium.org</owner>
+  <obsolete>
+    Deprecated as of M40. See BlacklistedSitesWithoutCustomPassphrase.
+  </obsolete>
+  <owner>gcasto@chromium.org</owner>
   <owner>vabr@chromium.org</owner>
   <summary>
     The total number of sites that the user has blacklisted. Recorded by
@@ -21925,6 +21949,25 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="PasswordManager.BlacklistedSitesWithCustomPassphrase">
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
+    Same as BlacklistedSites except distribution only includes users that are
+    syncing with custom passphrase encryption.
+  </summary>
+</histogram>
+
+<histogram name="PasswordManager.BlacklistedSitesWithoutCustomPassphrase">
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
+    The total number of sites that the user has blacklisted. Recorded by
+    iterating over stored passwords once per run of Chrome. Excludes custom
+    passphrase users.
+  </summary>
+</histogram>
+
 <histogram name="PasswordManager.Enabled" enum="BooleanEnabled">
   <owner>dubroy@chromium.org</owner>
   <owner>vabr@chromium.org</owner>
@@ -22060,7 +22103,10 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="PasswordManager.TimesGeneratedPasswordUsed">
-  <owner>dubroy@chromium.org</owner>
+  <obsolete>
+    Deprecated as of M40. See TimesGeneratedPasswordUsedWithoutCustomPassphrase
+  </obsolete>
+  <owner>gcasto@chromium.org</owner>
   <owner>vabr@chromium.org</owner>
   <summary>
     The number of times each generated password has been used to log in.
@@ -22069,10 +22115,53 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram
+    name="PasswordManager.TimesGeneratedPasswordUsedWithCustomPassphrase">
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
+    Same as TimesGeneratedPasswordUsed except distribution only includes users
+    that are syncing with custom passphrase encryption.
+  </summary>
+</histogram>
+
+<histogram
+    name="PasswordManager.TimesGeneratedPasswordUsedWithoutCustomPassphrase">
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
+    The number of times each generated password has been used to log in.
+    Recorded by iterating over stored passwords once per run. This information
+    is persisted and synced. This excludes custom passphrase users.
+  </summary>
+</histogram>
+
 <histogram name="PasswordManager.TimesPasswordUsed">
+  <obsolete>
+    Deprecated as of M40. See TimesPasswordUsedWithoutCustomPassphrase
+  </obsolete>
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
+    The number of times each saved password has been used to log in. Does not
+    include generated passwords. Recorded by iterating over stored passwords
+    once per run. This information is persisted and synced.
+  </summary>
+</histogram>
+
+<histogram name="PasswordManager.TimesPasswordUsedWithCustomPassphrase">

[Alexei Svitkine (slow), 2014/10/15 15:15:31]

Nit: I suggest delimiting the suffix with a "." to get better grouping on the
dashboard, so this can be:

PasswordManager.TimesPasswordUsed.WithCustomPassphrase

Same for the one below.

Then, you can use the <histogram_suffixes> construct in this file (see docs at
the top of the file) to avoid some repetition.

[Garrett Casto, 2014/10/16 22:52:10]

Neato. Done.

   <owner>dubroy@chromium.org</owner>
   <owner>vabr@chromium.org</owner>
   <summary>
+    Same as TimesPasswordUsed except distribution only includes users that are
+    sycning with custom passphrase encryption.
+  </summary>
+</histogram>
+
+<histogram name="PasswordManager.TimesPasswordUsedWithoutCustomPassphrase">
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
     The number of times each saved password has been used to log in. Does not
     include generated passwords. Recorded by iterating over stored passwords
     once per run. This information is persisted and synced.
@@ -22080,13 +22169,34 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="PasswordManager.TotalAccounts">
-  <owner>dubroy@chromium.org</owner>
+  <obsolete>
+    Deprecated as of M40. See TotalAccountsWithoutCustomPassphrase.
+  </obsolete>
+  <owner>gcasto@chromium.org</owner>
   <owner>vabr@chromium.org</owner>
   <summary>
     The number of accounts stored in the password manager (across all sites)
   </summary>
 </histogram>
 
+<histogram name="PasswordManager.TotalAccountsWithCustomPassphrase">
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
+    Same as TotalAccounts except distribution only includes users that are
+    syncing with custom passphrase encryption.
+  </summary>
+</histogram>
+
+<histogram name="PasswordManager.TotalAccountsWithoutCustomPasshrase">
+  <owner>gcasto@chromium.org</owner>
+  <owner>vabr@chromium.org</owner>
+  <summary>
+    The number of accounts stored in the password manager (across all sites).
+    Excludes custom passphrase users.
+  </summary>
+</histogram>
+
 <histogram name="PasswordManager.UIDismissalReason"
     enum="PasswordManagerUIDismissalReason">
   <owner>mkwst@chromium.org</owner>