Update metrics Servicification.startup

Previously, this metrics didn't recorded when ServiceManager has been started.
Therefore, we miss the data for the cases that Chrome is launching when the
ServiceManager is running. This CL fix it by recording the metrics in a regular
browser startup callback.

Calling recordStartupUma() doesn't re-commit the metrics data if it has been
committed before.

Bug: 905678
Change-Id: If8a38aa81144084dd46d843a7fc9c1340445d3d0
Reviewed-on: https://chromium-review.googlesource.com/c/1480994
Commit-Queue: Xi Han <hanxi@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635540}

content/public/android/java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java

@@ -349,6 +349,7 @@ public class BrowserStartupControllerImpl implements BrowserStartupController {
         mAsyncStartupCallbacks.clear();
 
         executeServiceManagerCallbacks(startupResult);
+        recordStartupUma();
     }
 
     private void executeServiceManagerCallbacks(int startupResult) {

content/public/android/java/src/org/chromium/content/browser/ServicificationStartupUma.java

@@ -108,6 +108,6 @@ public class ServicificationStartupUma {
 
     private void recordStartupMode(@ServicificationStartup int startupMode) {
         RecordHistogram.recordEnumeratedHistogram(
-                "Servicification.Startup", startupMode, ServicificationStartup.NUM_ENTRIES);
+                "Servicification.Startup2", startupMode, ServicificationStartup.NUM_ENTRIES);
     }
 }

tools/metrics/histograms/histograms.xml

@@ -105818,7 +105818,24 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Servicification.Startup" enum="ServicificationStartupMode"
+<histogram name="Servicification.Startup" enum="ServicificationStartupMode">
+  <obsolete>
+    Deprecated 2019-02 in favour of Servicification.Startup2. The data was
+    incompelete since it was only recorded the first time when the
+    ServiceManager was launched.
+  </obsolete>
+  <owner>hanxi@chromium.org</owner>
+  <owner>yfriedman@chromium.org</owner>
+  <owner>hnakashima@chromium.org</owner>
+  <owner>mheikal@chromium.org</owner>
+  <summary>
+    Histogram of how Chrome is launched, either in ServiceManager only mode or
+    as full browser, as well as either cold start or warm start. See
+    go/servicification_startup_metrics for more details.
+  </summary>
+</histogram>
+
+<histogram name="Servicification.Startup2" enum="ServicificationStartupMode"
     expires_after="2019-12-05">
   <owner>hanxi@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
@@ -105827,8 +105844,7 @@ uploading your change for review.
   <summary>
     Histogram of how Chrome is launched, either in ServiceManager only mode or
     as full browser, as well as either cold start or warm start. See
-    https://docs.google.com/document/d/1c8pM3LiNKoVcZ1OM9z4f5X4TrygQIG0te3KZMTx2FkY/edit
-    for more details.
+    go/servicification_startup_metrics for more details.
   </summary>
 </histogram>