Revert "Separate deferred startup into tasks."

chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java
index 6dad167052a8710a0976162c10d4193cd44ae864..bdbc1283a74d6fb14be65213c52a895e375d34d3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java
@@ -15,9 +15,9 @@ import org.chromium.base.annotations.JNINamespace;
 @JNINamespace("chrome::android")
 public class UmaUtils {
     private static long sApplicationStartWallClockMs;
+    private static long sApplicationStartUptimeMs;
 
     private static boolean sRunningApplicationStart;
-    private static long sForegroundStartTimeMs;
 
     /**
      * Record the time at which the activity started. This should be called asap after
@@ -29,10 +29,7 @@ public class UmaUtils {
         // then need the start time in the C++ side before we return to Java. As such we
         // save it in a static that the C++ can fetch once it has initialized the JNI.
         sApplicationStartWallClockMs = System.currentTimeMillis();
-    }
-
-    public static void recordForegroundStartTime() {
-        sForegroundStartTimeMs = SystemClock.uptimeMillis();
+        sApplicationStartUptimeMs = SystemClock.uptimeMillis();
     }
 
     /**
@@ -68,9 +65,8 @@ public class UmaUtils {
         return sApplicationStartWallClockMs;
     }
 
-    public static long getForegroundStartTime() {
-        assert sForegroundStartTimeMs != 0;
-        return sForegroundStartTimeMs;
+    public static long getMainEntryPointTime() {
+        return sApplicationStartUptimeMs;
     }
 
     private static native void nativeRecordMetricsReportingDefaultOptIn(boolean optIn);