Make the ChromeBrowserInitializer the only way to start the browser process.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ skipping 15 matching lines @@
 import org.chromium.base.ApplicationStatus.ApplicationStateListener;
 import org.chromium.base.BuildInfo;
 import org.chromium.base.CommandLineInitUtil;
 import org.chromium.base.PathUtils;
 import org.chromium.base.ResourceExtractor;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.SuppressFBWarnings;
-import org.chromium.base.library_loader.LibraryLoader;
-import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.accessibility.FontSizePrefs;
 import org.chromium.chrome.browser.banners.AppBannerManager;
 import org.chromium.chrome.browser.banners.AppDetailsDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.datausage.ExternalDataUseObserver;
 import org.chromium.chrome.browser.document.DocumentActivity;
 import org.chromium.chrome.browser.document.IncognitoDocumentActivity;
@@ skipping 38 matching lines @@
 import org.chromium.chrome.browser.sync.SyncController;
 import org.chromium.chrome.browser.tab.AuthenticatorNavigationInterceptor;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.document.ActivityDelegateImpl;
 import org.chromium.chrome.browser.tabmodel.document.DocumentTabModelSelector;
 import org.chromium.chrome.browser.tabmodel.document.StorageDelegate;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.content.app.ContentApplication;
-import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content.browser.ChildProcessLauncher;
 import org.chromium.content.browser.ContentViewStatics;
 import org.chromium.content.browser.DownloadController;
 import org.chromium.policy.AppRestrictionsProvider;
 import org.chromium.policy.CombinedPolicyProvider;
 import org.chromium.policy.CombinedPolicyProvider.PolicyChangeListener;
 import org.chromium.printing.PrintingController;
 import org.chromium.sync.signin.AccountManagerDelegate;
 import org.chromium.sync.signin.AccountManagerHelper;
 import org.chromium.sync.signin.SystemAccountManagerDelegate;
@@ skipping 376 matching lines @@
 
         PrefServiceBridge.getInstance().migratePreferences(this);
     }
 
     @Override
     public void initCommandLine() {
         CommandLineInitUtil.initCommandLine(this, COMMAND_LINE_FILE);
     }
 
     /**
-     * Start the browser process asynchronously. This will set up a queue of UI
-     * thread tasks to initialize the browser process.
-     *
-     * Note that this can only be called on the UI thread.
-     *
-     * @param callback the callback to be called when browser startup is complete.
-     * @throws ProcessInitException
-     */
-    public void startChromeBrowserProcessesAsync(BrowserStartupController.StartupCallback callback)
-            throws ProcessInitException {
-        assert ThreadUtils.runningOnUiThread() : "Tried to start the browser on the wrong thread";
-        // The policies are used by browser startup, so we need to register the policy providers
-        // before starting the browser process.
-        registerPolicyProviders(CombinedPolicyProvider.get());
-        Context applicationContext = getApplicationContext();
-        BrowserStartupController.get(applicationContext, LibraryProcessType.PROCESS_BROWSER)
-                .startBrowserProcessesAsync(callback);
-    }
-
-    /**
-     * Loads native Libraries synchronously and starts Chrome browser processes.
-     * Must be called on the main thread. Makes sure the process is initialized as a
-     * Browser process instead of a ContentView process.
-     *
-     * @param initGoogleServicesManager when true the GoogleServicesManager is initialized.
-     */
-    public void startBrowserProcessesAndLoadLibrariesSync(boolean initGoogleServicesManager)
-            throws ProcessInitException {
-        ThreadUtils.assertOnUiThread();
-        initCommandLine();
-        Context context = getApplicationContext();
-        LibraryLoader libraryLoader = LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER);
-        libraryLoader.ensureInitialized(context);
-        libraryLoader.asyncPrefetchLibrariesToMemory();
-        // The policies are used by browser startup, so we need to register the policy providers
-        // before starting the browser process.
-        registerPolicyProviders(CombinedPolicyProvider.get());
-        BrowserStartupController.get(context, LibraryProcessType.PROCESS_BROWSER)
-                .startBrowserProcessesSync(false);
-        if (initGoogleServicesManager) {
-            GoogleServicesManager.get(getApplicationContext());
-        }
-    }
-
-    /**
      * Shows an error dialog following a startup error, and then exits the application.
      * @param e The exception reported by Chrome initialization.
      */
     public static void reportStartupErrorAndExit(final ProcessInitException e) {
         Activity activity = ApplicationStatus.getLastTrackedFocusedActivity();
         if (ApplicationStatus.getStateForActivity(activity) == ActivityState.DESTROYED) {
             return;
         }
         InvalidStartupDialog.show(activity, e.getErrorCode());
     }
@@ skipping 182 matching lines @@
     public GSAHelper createGsaHelper() {
         return new GSAHelper();
     }
 
    /**
      * Registers various policy providers with the policy manager.
      * Providers are registered in increasing order of precedence so overrides should call this
      * method in the end for this method to maintain the highest precedence.
      * @param combinedProvider The {@link CombinedPolicyProvider} to register the providers with.
      */
-    protected void registerPolicyProviders(CombinedPolicyProvider combinedProvider) {
+    public void registerPolicyProviders(CombinedPolicyProvider combinedProvider) {
         combinedProvider.registerProvider(new AppRestrictionsProvider(getApplicationContext()));
     }
 
     /**
      * Add a listener to be notified upon policy changes.
      */
     public void addPolicyChangeListener(PolicyChangeListener listener) {
         CombinedPolicyProvider.get().addPolicyChangeListener(listener);
     }
 
@@ skipping 159 matching lines @@
      */
     private void updatePasswordEchoState() {
         boolean systemEnabled = Settings.System.getInt(
                 getApplicationContext().getContentResolver(),
                 Settings.System.TEXT_SHOW_PASSWORD, 1) == 1;
         if (PrefServiceBridge.getInstance().getPasswordEchoEnabled() == systemEnabled) return;
 
         PrefServiceBridge.getInstance().setPasswordEchoEnabled(systemEnabled);
     }
 }