Move part of initialization tasks to ProcessInitializationHandler

chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

Index: chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
index 0cf871e33eea831bb91f57cc4776b99c1918e83c..45c184b1e37470b71343c665a16326f024eb92a7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
@@ -19,6 +19,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.ChromeActivitySessionTracker;
 import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.ChromeBackupAgent;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.DeferredStartupHandler;
 import org.chromium.chrome.browser.DevToolsServer;
@@ -29,9 +30,11 @@ import org.chromium.chrome.browser.firstrun.ForcedSigninProcessor;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
 import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGenerator;
+import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.photo_picker.PhotoPickerDialog;
+import org.chromium.chrome.browser.physicalweb.PhysicalWeb;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.rlz.RevenueStats;
 import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
@@ -197,8 +200,40 @@ public class ProcessInitializationHandler {
     protected void handleDeferredStartupTasksInitialization() {
         final ChromeApplication application =
                 (ChromeApplication) ContextUtils.getApplicationContext();
+        DeferredStartupHandler deferredStartupHandler = DeferredStartupHandler.getInstance();
 
-        DeferredStartupHandler.getInstance().addDeferredTask(new Runnable() {
+        deferredStartupHandler.addDeferredTask(new Runnable() {
+            @Override
+            public void run() {
+                // Start or stop Physical Web
+                PhysicalWeb.onChromeStart();
+            }
+        });
+
+        deferredStartupHandler.addDeferredTask(new Runnable() {
+            @Override
+            public void run() {
+                LocaleManager.getInstance().recordStartupMetrics();
+            }
+        });
+
+        deferredStartupHandler.addDeferredTask(new Runnable() {
+            @Override
+            public void run() {
+                // Starts syncing with GSA.
+                AppHooks.get().createGsaHelper().startSync();
+            }
+        });
+
+        deferredStartupHandler.addDeferredTask(new Runnable() {
+            @Override
+            public void run() {
+                // Record the saved restore state in a histogram
+                ChromeBackupAgent.recordRestoreHistogram();
+            }
+        });
+
+        deferredStartupHandler.addDeferredTask(new Runnable() {
             @Override
             public void run() {
                 ForcedSigninProcessor.start(application, null);
@@ -217,7 +252,7 @@ public class ProcessInitializationHandler {
             }
         });
 
-        DeferredStartupHandler.getInstance().addDeferredTask(new Runnable() {
+        deferredStartupHandler.addDeferredTask(new Runnable() {
             @Override
             public void run() {
                 GoogleServicesManager.get(application).onMainActivityStart();
@@ -225,7 +260,7 @@ public class ProcessInitializationHandler {
             }
         });
 
-        DeferredStartupHandler.getInstance().addDeferredTask(new Runnable() {
+        deferredStartupHandler.addDeferredTask(new Runnable() {
             @Override
             public void run() {
                 mDevToolsServer = new DevToolsServer(DEV_TOOLS_SERVER_SOCKET_PREFIX);
@@ -234,7 +269,7 @@ public class ProcessInitializationHandler {
             }
         });
 
-        DeferredStartupHandler.getInstance().addDeferredTask(new Runnable() {
+        deferredStartupHandler.addDeferredTask(new Runnable() {
             @Override
             public void run() {
                 // Add process check to diagnose http://crbug.com/606309. Remove this after the bug