[Fork M59] android: Warmup after library load

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

Index: chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
index 73a6dd32d0eb6094a6e42f5f61778c0061c990ae..b87631a73d31fd448425e7966341dc4614aa8cbe 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
@@ -38,9 +38,9 @@ public abstract class AsyncInitTaskRunner {
         return ChromeVersionInfo.isOfficialBuild();
     }
 
-    private class LoadTask extends AsyncTask<Void, Void, Boolean> {
+    private class LoadTask extends AsyncTask<Boolean, Void, Boolean> {
         @Override
-        protected Boolean doInBackground(Void... params) {
+        protected Boolean doInBackground(Boolean... allocateChildConnection) {
             try {
                 LibraryLoader libraryLoader = LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER);
                 libraryLoader.ensureInitialized();
@@ -58,6 +58,9 @@ public abstract class AsyncInitTaskRunner {
             } catch (ProcessInitException e) {
                 return false;
             }
+            if (allocateChildConnection[0]) {
+                ChildProcessLauncher.warmUp(ContextUtils.getApplicationContext());
+            }
             return true;
         }
 
@@ -111,11 +114,8 @@ public abstract class AsyncInitTaskRunner {
             });
         }
 
-        if (allocateChildConnection) {
-            ChildProcessLauncher.warmUp(ContextUtils.getApplicationContext());
-        }
         mLoadTask = new LoadTask();
-        mLoadTask.executeOnExecutor(getExecutor());
+        mLoadTask.executeOnExecutor(getExecutor(), allocateChildConnection);
     }
 
     private void tasksPossiblyComplete(boolean result) {