ChromeBrowserInitializer offers runNowOrAfterFullBrowserStarted().

Reland of
https://chromium-review.googlesource.com/c/chromium/src/+/2032049
with fixes so avoid failing ChromeCustomTabsConnectionTest
(crbug.com/1048438).

Instead of runNowOrAfterNativeInitialization(), the method should
enqueue tasks to run when full browser starts, and not when native is
started. There is a distinction - reduced mode means native is started but full browser, which includes Profiles, isn't.

This fixes a crash when transitioning from reduced mode to full browser if a task that uses Profile was scheduled with
runNowOrAfterNativeInitialization(). Now, it will only run after the
transition, rather than immediately.

Also change hasNativeInitializationCompleted() to
isFullBrowserInitialized() and update clients. All but DownloadMetrics are meant to run in full browser, so that should actually revert their behavior back to what it was before reduced mode was introduced.

DownloadMetrics still checks if native was loaded, which includes in
reduced mode.

Bug: 1045945, 1014098, 1048438
Change-Id: If99179a5720d7e550ee5653a8625021f58fc262e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2037818Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738370}

chrome/android/java/src/org/chromium/chrome/browser/browserservices/ClearDataDialogResultRecorder.java

@@ -38,11 +38,10 @@ public class ClearDataDialogResultRecorder {
      * @param triggeredByUninstall Whether the dialog was triggered by uninstall.
      */
     public void handleDialogResult(boolean accepted, boolean triggeredByUninstall) {
-        if (accepted || mBrowserInitializer.hasNativeInitializationCompleted()) {
+        if (accepted || mBrowserInitializer.isFullBrowserInitialized()) {
             // If accepted, native is going to be loaded for the settings.
-            mBrowserInitializer.runNowOrAfterNativeInitialization(() ->
-                    mUmaRecorder.recordClearDataDialogAction(accepted,
-                            triggeredByUninstall));
+            mBrowserInitializer.runNowOrAfterFullBrowserStarted(
+                    () -> mUmaRecorder.recordClearDataDialogAction(accepted, triggeredByUninstall));
         } else {
             // Avoid loading native just for the sake of recording. Save the info and record
             // on next Chrome launch.

chrome/android/java/src/org/chromium/chrome/browser/browserservices/TrustedWebActivityUmaRecorder.java

@@ -159,6 +159,6 @@ public class TrustedWebActivityUmaRecorder {
     }
 
     private void doWhenNativeLoaded(Runnable runnable) {
-        mBrowserInitializer.runNowOrAfterNativeInitialization(runnable);
+        mBrowserInitializer.runNowOrAfterFullBrowserStarted(runnable);
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java

@@ -811,7 +811,7 @@ public class CustomTabsConnection {
         if (mWarmupTasks != null) mWarmupTasks.cancel();
 
         maybePreconnectToRedirectEndpoint(session, url, intent);
-        ChromeBrowserInitializer.getInstance().runNowOrAfterNativeInitialization(
+        ChromeBrowserInitializer.getInstance().runNowOrAfterFullBrowserStarted(
                 () -> handleParallelRequest(session, intent));
         maybePrefetchResources(session, intent);
     }
@@ -819,7 +819,7 @@ public class CustomTabsConnection {
     private void maybePreconnectToRedirectEndpoint(
             CustomTabsSessionToken session, String url, Intent intent) {
         // For the preconnection to not be a no-op, we need more than just the native library.
-        if (!ChromeBrowserInitializer.getInstance().hasNativeInitializationCompleted()) {
+        if (!ChromeBrowserInitializer.getInstance().isFullBrowserInitialized()) {
             return;
         }
         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CCT_REDIRECT_PRECONNECT)) return;
@@ -878,7 +878,7 @@ public class CustomTabsConnection {
         ThreadUtils.assertOnUiThread();
 
         if (!intent.hasExtra(PARALLEL_REQUEST_URL_KEY)) return ParallelRequestStatus.NO_REQUEST;
-        if (!ChromeBrowserInitializer.getInstance().hasNativeInitializationCompleted()) {
+        if (!ChromeBrowserInitializer.getInstance().isFullBrowserInitialized()) {
             return ParallelRequestStatus.FAILURE_NOT_INITIALIZED;
         }
         if (!mClientManager.getAllowParallelRequestForSession(session)) {

chrome/android/java/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityNavigationController.java

@@ -196,7 +196,7 @@ public class CustomTabActivityNavigationController implements StartStopWithNativ
      * Handles back button navigation.
      */
     public boolean navigateOnBack() {
-        if (!mChromeBrowserInitializer.hasNativeInitializationCompleted()) return false;
+        if (!mChromeBrowserInitializer.isFullBrowserInitialized()) return false;
 
         RecordUserAction.record("CustomTabs.SystemBack");
         if (mTabProvider.getTab() == null) return false;

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadMetrics.java

@@ -5,8 +5,9 @@
 package org.chromium.chrome.browser.download;
 
 import org.chromium.base.Log;
+import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
+import org.chromium.content_public.browser.BrowserStartupController;
 
 import java.util.ArrayList;
 
@@ -99,6 +100,6 @@ public class DownloadMetrics {
     }
 
     private static boolean isNativeLoaded() {
-        return ChromeBrowserInitializer.getInstance().hasNativeInitializationCompleted();
+        return BrowserStartupController.get(LibraryProcessType.PROCESS_BROWSER).isNativeStarted();
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepagePolicyManager.java

@@ -110,7 +110,7 @@ public class HomepagePolicyManager implements PrefObserver {
         mIsHomepageLocationPolicyEnabled = !TextUtils.isEmpty(mHomepage);
 
         if (isFeatureFlagEnabled()) {
-            ChromeBrowserInitializer.getInstance().runNowOrAfterNativeInitialization(
+            ChromeBrowserInitializer.getInstance().runNowOrAfterFullBrowserStarted(
                     this::onFinishNativeInitialization);
         }
     }

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

@@ -66,11 +66,12 @@ public class ChromeBrowserInitializer {
     private static ChromeBrowserInitializer sChromeBrowserInitializer;
     private static BrowserStartupController sBrowserStartupController;
     private final Locale mInitialLocale = Locale.getDefault();
-    private List<Runnable> mTasksToRunWithNative;
+    private List<Runnable> mTasksToRunWithFullBrowser;
 
     private boolean mPreInflationStartupComplete;
     private boolean mPostInflationStartupComplete;
     private boolean mNativeInitializationComplete;
+    private boolean mFullBrowserInitializationComplete;
     private boolean mNetworkChangeNotifierInitializationComplete;
 
     /**
@@ -85,27 +86,36 @@ public class ChromeBrowserInitializer {
     }
 
     /**
-     * @return whether native initialization is complete.
+     * @return whether native (full browser) initialization is complete.
      */
+    public boolean isFullBrowserInitialized() {
+        return mFullBrowserInitializationComplete;
+    }
+
+    /**
+     * @deprecated use isFullBrowserInitialized() instead, the name hasNativeInitializationCompleted
+     * is not accurate.
+     */
+    @Deprecated
     public boolean hasNativeInitializationCompleted() {
-        return mNativeInitializationComplete;
+        return isFullBrowserInitialized();
     }
 
     /**
-     * Either runs a task now, or queue it until native initialization is done.
+     * Either runs a task now, or queue it until native (full browser) initialization is done.
      *
      * All Runnables added this way will run in a single UI thread task.
      *
      * @param task The task to run.
      */
-    public void runNowOrAfterNativeInitialization(Runnable task) {
-        if (hasNativeInitializationCompleted()) {
+    public void runNowOrAfterFullBrowserStarted(Runnable task) {
+        if (isFullBrowserInitialized()) {
             task.run();
         } else {
-            if (mTasksToRunWithNative == null) {
-                mTasksToRunWithNative = new ArrayList<Runnable>();
+            if (mTasksToRunWithFullBrowser == null) {
+                mTasksToRunWithFullBrowser = new ArrayList<Runnable>();
             }
-            mTasksToRunWithNative.add(task);
+            mTasksToRunWithFullBrowser.add(task);
         }
     }
 
@@ -293,6 +303,10 @@ public class ChromeBrowserInitializer {
             tasks.add(UiThreadTaskTraits.DEFAULT, this::onFinishNativeInitialization);
         }
 
+        if (!delegate.startServiceManagerOnly()) {
+            tasks.add(UiThreadTaskTraits.DEFAULT, this::onFinishFullBrowserInitialization);
+        }
+
         int startupMode =
                 getBrowserStartupController().getStartupMode(delegate.startServiceManagerOnly());
         tasks.add(UiThreadTaskTraits.DEFAULT, () -> {
@@ -378,6 +392,15 @@ public class ChromeBrowserInitializer {
         SpeechRecognition.initialize();
     }
 
+    private void onFinishFullBrowserInitialization() {
+        mFullBrowserInitializationComplete = true;
+
+        if (mTasksToRunWithFullBrowser != null) {
+            for (Runnable r : mTasksToRunWithFullBrowser) r.run();
+            mTasksToRunWithFullBrowser = null;
+        }
+    }
+
     private void onFinishNativeInitialization() {
         if (mNativeInitializationComplete) return;
 
@@ -406,10 +429,6 @@ public class ChromeBrowserInitializer {
                 });
 
         MemoryPressureUma.initializeForBrowser();
-        if (mTasksToRunWithNative != null) {
-            for (Runnable r : mTasksToRunWithNative) r.run();
-            mTasksToRunWithNative = null;
-        }
 
         // Needed for field trial metrics to be properly collected in ServiceManager only mode.
         ChromeCachedFlags.getInstance().cacheServiceManagerOnlyFlags();

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/AutoFetchNotifier.java

@@ -106,14 +106,14 @@ public class AutoFetchNotifier {
                 return;
             }
 
-            // Chrome may or may not be running. Use runNowOrAfterNativeInitialization() to trigger
-            // the cancellation if Chrome is running. If Chrome isn't running,
-            // runNowOrAfterNativeInitialization() will never call our runnable, so set a pref to
-            // remember to cancel on next startup.
+            // Chrome may or may not be running. Use runNowOrAfterFullBrowserStarted() to trigger
+            // the cancellation if Chrome is running in full browser. If Chrome isn't running in
+            // full browser, runNowOrAfterFullBrowserStarted() will never call our runnable, so set
+            // a pref to remember to cancel on next startup.
             SharedPreferencesManager.getInstance().writeInt(
                     ChromePreferenceKeys.OFFLINE_AUTO_FETCH_USER_CANCEL_ACTION_IN_PROGRESS, action);
             // This will call us back with cancellationComplete().
-            ChromeBrowserInitializer.getInstance().runNowOrAfterNativeInitialization(
+            ChromeBrowserInitializer.getInstance().runNowOrAfterFullBrowserStarted(
                     AutoFetchNotifier::cancelInProgress);
             // Finally, whether chrome is running or not, remove the notification.
             closeInProgressNotification();

chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java

@@ -126,7 +126,7 @@ public class ChromeGcmListenerService extends GcmListenerService {
      * the next time Chrome is launched into foreground.
      */
     private static boolean maybePersistLazyMessage(GCMMessage message) {
-        if (isNativeLoaded()) {
+        if (isFullBrowserLoaded()) {
             return false;
         }
 
@@ -221,7 +221,7 @@ public class ChromeGcmListenerService extends GcmListenerService {
         GCMDriver.dispatchMessage(message);
     }
 
-    private static boolean isNativeLoaded() {
-        return ChromeBrowserInitializer.getInstance().hasNativeInitializationCompleted();
+    private static boolean isFullBrowserLoaded() {
+        return ChromeBrowserInitializer.getInstance().isFullBrowserInitialized();
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/init/ChromeBrowserInitializerTest.java

@@ -25,16 +25,16 @@ public class ChromeBrowserInitializerTest {
     @Before
     public void setUp() {
         mInstance = ChromeBrowserInitializer.getInstance();
-        Assert.assertFalse(mInstance.hasNativeInitializationCompleted());
+        Assert.assertFalse(mInstance.isFullBrowserInitialized());
     }
 
     @Test
     @SmallTest
     public void testSynchronousInitialization() throws Exception {
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            Assert.assertFalse(mInstance.hasNativeInitializationCompleted());
+            Assert.assertFalse(mInstance.isFullBrowserInitialized());
             mInstance.handleSynchronousStartup();
-            Assert.assertTrue(mInstance.hasNativeInitializationCompleted());
+            Assert.assertTrue(mInstance.isFullBrowserInitialized());
             return true;
         });
     }
@@ -50,17 +50,16 @@ public class ChromeBrowserInitializerTest {
             }
         };
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            Assert.assertFalse(mInstance.hasNativeInitializationCompleted());
+            Assert.assertFalse(mInstance.isFullBrowserInitialized());
             mInstance.handlePreNativeStartup(parts);
             mInstance.handlePostNativeStartup(true, parts);
 
-            Assert.assertFalse(
-                    "Should not be synchronous", mInstance.hasNativeInitializationCompleted());
+            Assert.assertFalse("Should not be synchronous", mInstance.isFullBrowserInitialized());
             return true;
         });
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             Assert.assertFalse("Inititialization tasks should yield to new UI thread tasks",
-                    mInstance.hasNativeInitializationCompleted());
+                    mInstance.isFullBrowserInitialized());
         });
         Assert.assertTrue(done.tryAcquire(10, TimeUnit.SECONDS));
     }
@@ -70,14 +69,14 @@ public class ChromeBrowserInitializerTest {
     public void testDelayedTasks() throws Exception {
         final Semaphore done = new Semaphore(0);
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mInstance.runNowOrAfterNativeInitialization(done::release);
+            mInstance.runNowOrAfterFullBrowserStarted(done::release);
             Assert.assertFalse("Should not run synchronously", done.tryAcquire());
             mInstance.handleSynchronousStartup();
             Assert.assertTrue(done.tryAcquire());
             return true;
         });
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            mInstance.runNowOrAfterNativeInitialization(done::release);
+            mInstance.runNowOrAfterFullBrowserStarted(done::release);
             // Runs right away in the same task is initialization is done.
             Assert.assertTrue(done.tryAcquire());
         });

chrome/android/junit/src/org/chromium/chrome/browser/browserservices/ClearDataDialogResultRecorderTest.java

@@ -101,9 +101,10 @@ public class ClearDataDialogResultRecorderTest {
     }
 
     private void restartApp() {
-        when(mBrowserInitializer.hasNativeInitializationCompleted()).thenReturn(false);
-        doNothing().when(mBrowserInitializer).runNowOrAfterNativeInitialization(
-                mTaskOnNativeInitCaptor.capture());
+        when(mBrowserInitializer.isFullBrowserInitialized()).thenReturn(false);
+        doNothing()
+                .when(mBrowserInitializer)
+                .runNowOrAfterFullBrowserStarted(mTaskOnNativeInitCaptor.capture());
         mRecorder = new ClearDataDialogResultRecorder(() -> mPrefsManager, mBrowserInitializer,
                 mUmaRecorder);
     }
@@ -112,9 +113,10 @@ public class ClearDataDialogResultRecorderTest {
         for (Runnable task : mTaskOnNativeInitCaptor.getAllValues()) {
             task.run();
         }
-        when(mBrowserInitializer.hasNativeInitializationCompleted()).thenReturn(true);
-        doAnswer(answerVoid(Runnable::run)).when(mBrowserInitializer)
-                .runNowOrAfterNativeInitialization(any());
+        when(mBrowserInitializer.isFullBrowserInitialized()).thenReturn(true);
+        doAnswer(answerVoid(Runnable::run))
+                .when(mBrowserInitializer)
+                .runNowOrAfterFullBrowserStarted(any());
     }
 
 }

chrome/android/junit/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityContentTestEnvironment.java

@@ -122,7 +122,7 @@ public class CustomTabActivityContentTestEnvironment extends TestWatcher {
         when(tabFactory.getTabModelSelector()).thenReturn(tabModelSelector);
         when(tabModelSelector.getModel(anyBoolean())).thenReturn(tabModel);
         when(connection.getSpeculatedUrl(any())).thenReturn(SPECULATED_URL);
-        when(browserInitializer.hasNativeInitializationCompleted()).thenReturn(true);
+        when(browserInitializer.isFullBrowserInitialized()).thenReturn(true);
         // Default setup is toolbarManager doesn't consume back press event.
         when(toolbarManager.back()).thenReturn(false);
 

chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestRule.java

@@ -194,9 +194,9 @@ public class ChromeActivityTestRule<T extends ChromeActivity> extends ActivityTe
      * @param activity The {@link ChromeActivity} to wait for.
      */
     public static void waitForActivityNativeInitializationComplete(ChromeActivity activity) {
-        CriteriaHelper.pollUiThread(()
-                                            -> ChromeBrowserInitializer.getInstance()
-                                                       .hasNativeInitializationCompleted(),
+        CriteriaHelper.pollUiThread(
+                ()
+                        -> ChromeBrowserInitializer.getInstance().isFullBrowserInitialized(),
                 "Native initialization never finished",
                 20 * CriteriaHelper.DEFAULT_MAX_TIME_TO_POLL,
                 CriteriaHelper.DEFAULT_POLLING_INTERVAL);