Android: Guard against multiple stat uploads

chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.java

Index: chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.java
index d8c547117389f483f1c1415bdb133b9121cbeb96..c92e632ae6cea401f212dad43aa430ca91069d1e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.java
@@ -106,7 +106,7 @@ public class DeferredStartupHandler {
             public boolean queueIdle() {
                 Runnable currentTask = mDeferredTasks.poll();
                 if (currentTask == null) {
-                    if (mDeferredStartupInitializedForApp) {
+                    if (mDeferredStartupInitializedForApp && !mDeferredStartupCompletedForApp) {
                         mDeferredStartupCompletedForApp = true;
                         recordDeferredStartupStats();
                     }
@@ -137,7 +137,6 @@ public class DeferredStartupHandler {
                 "UMA.Debug.EnableCrashUpload.DeferredStartUpCompleteTime",
                 SystemClock.uptimeMillis() - UmaUtils.getForegroundStartTime(),
                 TimeUnit.MILLISECONDS);
-        LocaleManager.getInstance().recordStartupMetrics();
     }
 
     /**
@@ -219,6 +218,13 @@ public class DeferredStartupHandler {
             }
         });
 
+        mDeferredTasks.add(new Runnable() {
+            @Override
+            public void run() {
+                LocaleManager.getInstance().recordStartupMetrics();
+            }
+        });
+
         final ChromeApplication application = (ChromeApplication) mAppContext;
 
         mDeferredTasks.add(new Runnable() {