Revert "Separate deferred startup into tasks."

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 f92be5926a91816f78bba712b69de6f803a39b99..ac5dee11644800af5155222f2813e77b33aa4b8a 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -56031,9 +56031,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Startup.FirstCommitNavigationTime" units="ms">
-  <obsolete>
-    Replaced by Startup.FirstCommitNavigationTime2
-  </obsolete>
   <owner>pasko@chromium.org</owner>
   <summary>
     [Android only] The time from the earliest entry point in the browser process
@@ -56042,16 +56039,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="Startup.FirstCommitNavigationTime2" units="ms">
-  <owner>pasko@chromium.org</owner>
-  <owner>wnwen@chromium.org</owner>
-  <summary>
-    [Android only] The time from the first foreground entry point in the app to
-    the moment the first navigation is committed, i.e. when renderer gets the
-    first byte of the document.
-  </summary>
-</histogram>
-
 <histogram name="Startup.FirstWebContents.FinishReason"
     enum="StartupProfilingFinishReason">
   <owner>gab@chromium.org</owner>
@@ -60438,15 +60425,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="UMA.Debug.EnableCrashUpload.DeferredStartUpCompleteTime"
-    units="ms">
-  <owner>wnwen@chromium.org</owner>
-  <summary>
-    Measures how much time since application was first in foreground till all
-    deferred tasks are done. Only logged on Android.
-  </summary>
-</histogram>
-
 <histogram name="UMA.Debug.EnableCrashUpload.DeferredStartUpDuration"
     units="ms">
   <owner>wnwen@chromium.org</owner>
@@ -60467,18 +60445,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="UMA.Debug.EnableCrashUpload.DeferredStartUpMaxTaskDuration"
-    units="ms">
-  <owner>wnwen@chromium.org</owner>
-  <summary>
-    Measures the maximum amount of time a single deferred startup task took.
-  </summary>
-</histogram>
-
 <histogram name="UMA.Debug.EnableCrashUpload.DeferredStartUptime" units="ms">
-  <obsolete>
-    Replaced by UMA.Debug.EnableCrashUpload.DeferredStartUptime2
-  </obsolete>
   <owner>asvitkine@chromium.org</owner>
   <summary>
     Measures how much time since start up it took for onDeferredStartup() to be
@@ -60487,21 +60454,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="UMA.Debug.EnableCrashUpload.DeferredStartUptime2" units="ms">
-  <owner>wnwen@chromium.org</owner>
-  <owner>asvitkine@chromium.org</owner>
-  <summary>
-    Measures how much time since application was first in foreground till
-    deferred tasks are initialized and queued on the idle handler. Only logged
-    on Android.
-  </summary>
-</histogram>
-
 <histogram name="UMA.Debug.EnableCrashUpload.PostDeferredStartUptime"
     units="ms">
-  <obsolete>
-    Replaced by UMA.Debug.EnableCrashUpload.PostDeferredStartUptime2
-  </obsolete>
   <owner>asvitkine@chromium.org</owner>
   <summary>
     Measures how much time since start up it took before ChromeActivity's
@@ -60509,17 +60463,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="UMA.Debug.EnableCrashUpload.PostDeferredStartUptime2"
-    units="ms">
-  <owner>wnwen@chromium.org</owner>
-  <owner>asvitkine@chromium.org</owner>
-  <summary>
-    Measures how much time since application was first in foreground till
-    ChromeActivity's postDeferredStartupIfNeeded() was called exactly once. Only
-    logged on Android.
-  </summary>
-</histogram>
-
 <histogram name="UMA.Debug.EnableCrashUpload.Uptime" units="ms">
   <obsolete>
     Replaced by UMA.Debug.EnableCrashUpload.Uptime2
@@ -60533,9 +60476,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="UMA.Debug.EnableCrashUpload.Uptime2" units="ms">
-  <obsolete>
-    Replaced by UMA.Debug.EnableCrashUpload.Uptime3
-  </obsolete>
   <owner>asvitkine@chromium.org</owner>
   <summary>
     Measures how much time since start up it took before crash reporting was
@@ -60544,16 +60484,6 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
-<histogram name="UMA.Debug.EnableCrashUpload.Uptime3" units="ms">
-  <owner>wnwen@chromium.org</owner>
-  <owner>asvitkine@chromium.org</owner>
-  <summary>
-    Measures how much time since application was first in foreground till crash
-    reporting was enabled via enablePotentialCrashUploading() as part of
-    deferred start up. Only logged on Android.
-  </summary>
-</histogram>
-
 <histogram name="UMA.Discarded Log Events">
   <owner>asvitkine@chromium.org</owner>
   <summary>