| 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 dc79c4122ba1f3b992a9a5cbe9bc358f73583b9a..96908cc05d0578cabfc625c756bf745bb07d9e0d 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
|
| @@ -24,6 +24,7 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity;
|
| import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
|
| import org.chromium.chrome.browser.document.ChromeLauncherActivity;
|
| import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
|
| +import org.chromium.chrome.browser.init.EmptyBrowserParts;
|
| import org.chromium.chrome.browser.metrics.UmaUtils;
|
| import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
|
| import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoUtils;
|
| @@ -173,6 +174,8 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
|
| protected void onCreate(Bundle savedInstanceState) {
|
| super.onCreate(savedInstanceState);
|
|
|
| + ChromeBrowserInitializer.getInstance(this).handlePreNativeStartup(new EmptyBrowserParts());
|
| +
|
| if (savedInstanceState != null) {
|
| mFreProperties = savedInstanceState;
|
| } else if (getIntent() != null) {
|
| @@ -513,7 +516,8 @@ public class FirstRunActivity extends AppCompatActivity implements FirstRunPageD
|
| private void ensureBrowserProcessInitialized() {
|
| if (mNativeSideIsInitialized) return;
|
| try {
|
| - ChromeBrowserInitializer.getInstance(this).handleSynchronousStartup();
|
| + ChromeBrowserInitializer.getInstance(this).handlePostNativeStartup(
|
| + false, new EmptyBrowserParts());
|
| mNativeSideIsInitialized = true;
|
| } catch (ProcessInitException e) {
|
| Log.e(TAG, "Unable to load native library.", e);
|
|
|