| Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
| index 360c6c2d3bf34f65d30d3395577a25fe625da5ea..4d69d08b66ae240504da854136c852f9ac98a333 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
| @@ -11,9 +11,9 @@ import android.os.Bundle;
|
| import android.support.v4.view.ViewPager;
|
| import android.support.v7.app.AppCompatActivity;
|
| import android.text.TextUtils;
|
| -import android.util.Log;
|
|
|
| import org.chromium.base.ApplicationStatus;
|
| +import org.chromium.base.Log;
|
| import org.chromium.base.VisibleForTesting;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| import org.chromium.base.metrics.RecordHistogram;
|
| @@ -21,6 +21,7 @@ import org.chromium.base.metrics.RecordUserAction;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.ChromeApplication;
|
| import org.chromium.chrome.browser.EmbedContentViewActivity;
|
| +import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
|
| import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
|
| import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoScreen;
|
| import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma;
|
| @@ -405,8 +406,7 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
|
| // This should happen before super.onCreate() because it might recreate a fragment,
|
| // and a fragment might depend on the native library.
|
| try {
|
| - ((ChromeApplication) getApplication())
|
| - .startBrowserProcessesAndLoadLibrariesSync(true);
|
| + ChromeBrowserInitializer.getInstance(this).handleSynchronousStartup();
|
| mNativeSideIsInitialized = true;
|
| } catch (ProcessInitException e) {
|
| Log.e(TAG, "Unable to load native library.", e);
|
|
|