Transfer ownership of all SoftwareReporter.* histograms to drubery and

chrome-safebrowsing-alerts.

Extend SoftwareReporter.* histograms that expire in M82.

R=drubery

Bug: 1053148
Change-Id: Id31b95bbdacc4df8e6fc50d52aadcfdf58bb0dde
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2071051
Commit-Queue: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751510}

tools/metrics/histograms/histograms.xml

@@ -153842,7 +153842,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.Cleaner.ChromePromptChannelError"
     enum="SoftwareReporterChromePromptChannelError" expires_after="M90">
-  <owner>joenotcharles@chromium.org</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Keeps a tally of IPC related errors between chrome_cleaner and chrome. The
     first two bytes of the bucket represent the error category and the two last
@@ -153852,7 +153853,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.Cleaner.CleaningTime" units="ms"
     expires_after="M85">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The time between sending the user's response to the Chrome Cleaner process
     and the Cleaner process terminating. This histogram is logged only for
@@ -153862,7 +153864,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.Cleaner.CleanupResult"
     enum="SoftwareReporterCleanupResult" expires_after="M85">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The final status of the Chrome Cleanup Tool run (e.g. succeeded, failed,
     reboot required).
@@ -153883,7 +153886,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.Cleaner.DownloadStatus"
     enum="SoftwareReporterCleanerDownloadStatus" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     An indication if an attempt to download the Chrome Cleanup Tool succeeded or
     the reason why it failed.
@@ -153892,7 +153896,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.Cleaner.DownloadStatusErrorCode"
     enum="CombinedHttpResponseAndNetErrorCode" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The HTTP response or net error code when trying to download the Chrome
     Cleanup Tool.
@@ -153900,8 +153905,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.Cleaner.HasCompleted" enum="SRTCompleted"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The state of software reporter cleaner tool runs. A value of &quot;Not
     Completed&quot; can mean either the tool crashed, or the tool was still
@@ -153911,7 +153917,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.Cleaner.HasRebooted" enum="BooleanRebooted"
     expires_after="M85">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Whether a reboot happened since the software reporter cleaner tool has
     finished execution with a pre-reboot exit code.
@@ -153944,7 +153951,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.Cleaner.RebootResponse" enum="Boolean"
     expires_after="M85">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Indicates that the user accepted to initiate a reboot to complete a run of
     the Chrome Cleanup Tool. This is logged the user starts a reboot from the
@@ -153956,13 +153964,15 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.Cleaner.RunningTime" units="ms"
     expires_after="M85">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>How long it took to run the software reporter cleaner tool.</summary>
 </histogram>
 
 <histogram name="SoftwareReporter.Cleaner.ScanningTime" units="ms"
     expires_after="M85">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The time between launching the Chrome Cleaner process and the cleaner having
     scanned the user's machine and Chrome receiving an IPC call with the
@@ -153973,7 +153983,8 @@ should be kept until we use this API.  -->
 <histogram name="SoftwareReporter.Cleaner.SettingsPageActiveOnRebootRequired"
     enum="SoftwareReporterCleanerSettingsPageActiveOnRebootRequired"
     expires_after="M85">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Indicates if the Settings page was the active tab once a cleanup finished
     with reboot required.
@@ -153981,8 +153992,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.Cleaner.TimeToCompleteDownload" units="ms"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The time between the first attempt to download the Chrome Cleanup tool and a
     successful download or the last unsuccessful attempt to download without
@@ -153991,14 +154003,16 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.Cleaner.Version" units="units"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>The build version of the software reporter cleaner tool.</summary>
 </histogram>
 
 <histogram name="SoftwareReporter.CleanerLogsAcceptance" enum="BooleanAccepted"
     expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Whether the user accepted to upload logs from Chrome Cleanup Tool. This is
     logged when the user accepts the Chrome prompt to start a cleanup either
@@ -154008,7 +154022,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.CleanupCard" enum="Boolean"
     expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Whether the Chrome Cleanup Tool card in the Settings page has been shown.
   </summary>
@@ -154016,7 +154031,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.CleanupStarted"
     enum="SoftwareReporterCleanupStarted" expires_after="M85">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Indicates where the user started a cleanup from (e.g. from the prompt dialog
     or the settings page).
@@ -154047,8 +154063,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.FoundUwSReadError" enum="BooleanError"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Whether there was an error reading the registry key containing UwS found by
     the Software Removal Tool.
@@ -154057,7 +154074,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.IPCDisconnected"
     enum="SoftwareReporterIPCDisconnected" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Indicates when the IPC with the Chrome Cleanup Tool process is disconnected
     from Chrome. Success is logged when it's disconnected and no longer needed
@@ -154070,14 +154088,16 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.LastUploadResult" enum="BooleanSuccess"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>The result of the most recent SRT log upload.</summary>
 </histogram>
 
 <histogram name="SoftwareReporter.LogsUploadEnabled"
     enum="SoftwareReporterLogsUploadEnabled" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     If logs uploads are enabled in the Software Reporter or the reason why it is
     disabled. Recorded before each run of the Software Reporter.
@@ -154086,7 +154106,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.LogsUploadResult"
     enum="SoftwareReporterLogsUploadResult" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The result of the most recent Software Reporter logs upload. Written by the
     Software Reporter in the registry and sent by Chrome after the reporter
@@ -154096,7 +154117,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.LogsUploadResultRegistryError"
     enum="SoftwareReporterLogsUploadResultRegistryError" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Error encountered when reading the software reporter logs upload result from
     the registry.
@@ -154104,8 +154126,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.MajorVersion" units="units"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     As SoftwareReporter.MinorVersion, but a double word combination of the other
     components of the version of the software reporter. The high word is the
@@ -154114,8 +154137,9 @@ should be kept until we use this API.  -->
   </summary>
 </histogram>
 
-<histogram name="SoftwareReporter.MemoryUsed" units="KB" expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+<histogram name="SoftwareReporter.MemoryUsed" units="KB" expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The memory used by the software reporter tool as reported by the tool itself
     via the registry. Logged just after the software reporter tool has finished.
@@ -154123,8 +154147,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.MinorVersion" units="units"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The last component of the version of the software reporter that was executed
     so we can identify when users are not getting their component updated as
@@ -154134,7 +154159,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.NoPromptReason"
     enum="SoftwareReporterNoPromptReason" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The reason why the user has not been prompted to run the Chrome Cleanup Tool
     (e.g. no unwanted software found, user recently prompted).
@@ -154143,7 +154169,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.NumberOfFilesToDelete" units="counts"
     expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The number of files to be deleted by the Chrome Cleanup Tool.
   </summary>
@@ -154151,7 +154178,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.OnDemandUpdateRequired"
     enum="BooleanRequired" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Whether an on-demand update of the Software Reporter component was needed
     for a user-initiated cleanup.
@@ -154160,7 +154188,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.OnDemandUpdateSucceeded"
     enum="BooleanSuccess" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Whether an on-demand update of the Software Reporter component succeeded,
     when needed for a user-initiated cleanup.
@@ -154169,7 +154198,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.PostCleanupSettingsReset" units="counts"
     expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The number of profiles whose settings will be reset once a successful
     cleanup completes.
@@ -154177,8 +154207,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.PromptDialog.TimeUntilDone" units="ms"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The time between the Chrome Cleaner dialog being shown and the dialog being
     closed.
@@ -154187,7 +154218,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.PromptDialogResponse"
     enum="SoftwareReporterPromptDialogResponse" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The user response on the modal Chrome Cleanup Tool prompt dialog (e.g.
     accepted, cancelled).
@@ -154207,7 +154239,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.PromptShownWithType"
     enum="SoftwareReporterPromptShownWithType" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Whether the user has been prompted to run the Chrome Cleanup Tool and which
     type of prompt has been shown.
@@ -154227,22 +154260,25 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.ReporterSequenceResult"
-    enum="SoftwareReporterSequenceResult" expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    enum="SoftwareReporterSequenceResult" expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>Indicates the result of a reporter sequence once it ends.</summary>
 </histogram>
 
 <histogram name="SoftwareReporter.ReporterSequenceType"
     enum="SoftwareReporterSequenceType" expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Indicates the type of a reporter sequence run on the user system. Logged
     when the sequence is scheduled to start.
   </summary>
 </histogram>
 
-<histogram name="SoftwareReporter.RunningTime" units="ms" expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+<histogram name="SoftwareReporter.RunningTime" units="ms" expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The amount of time it took to run the software reporter tool as reported by
     the tool itself via the registry. Logged just after the software reporter
@@ -154251,8 +154287,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.RunningTimeAccordingToChrome" units="ms"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The amount of time it took for the software reporter to run as measured by
     chrome. Logged just after the software reporter tool has finished.
@@ -154260,8 +154297,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.RunningTimeRegistryError"
-    enum="SwReporterRunningTimeRegistryError" expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    enum="SwReporterRunningTimeRegistryError" expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Error encountered when reading the software reporter tool's start and end
     times from the registry.
@@ -154270,7 +154308,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.ScannerLogsAcceptance" enum="BooleanAccepted"
     expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Whether the user accepted to upload scanner logs from Chrome Cleanup Tool.
     This is logged when the user starts a scan for the Settings page and is only
@@ -154279,8 +154318,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.Step" enum="SwReporterStep"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The registration and execution steps for the software reporter.
   </summary>
@@ -154288,7 +154328,8 @@ should be kept until we use this API.  -->
 
 <histogram name="SoftwareReporter.TaggedProfileForResetting" enum="Boolean"
     expires_after="M90">
-  <owner>joenotcharles@google.com</owner>
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Registers when a profile is tagged for settings reset before a run of the
     Chrome Cleanup Tool.
@@ -154296,8 +154337,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.UploadFailureCount" units="units"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The total count of SRT log upload failures experienced by this machine for
     all time. This value is reported at startup by Chrome and is capped at 64.
@@ -154305,8 +154347,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.UploadLongestFailureRun" units="units"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The longest run of upload failures logged by SRT runs. This value is
     reported at startup by Chrome and is capped at 64.
@@ -154314,8 +154357,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="SoftwareReporter.UploadSuccessCount" units="units"
-    expires_after="M82">
-  <owner>joenotcharles@google.com</owner>
+    expires_after="M83">
+  <owner>drubery@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The total count of successful SRT log uploads experienced by this machine
     for all time. This value is reported at startup by Chrome and is capped at