| Index: chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
|
| index f18328a199e643d7c26f516bf513e8b8dd151756..505233a4d4f59ddcc9d949ec92debec618564098 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
|
| @@ -182,7 +182,6 @@ public class ChromeBrowserInitializer {
|
| private void preInflationStartup() {
|
| ThreadUtils.assertOnUiThread();
|
| if (mPreInflationStartupComplete) return;
|
| -
|
| ContextUtils.initApplicationContext(mApplication);
|
| PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, mApplication);
|
|
|
| @@ -316,6 +315,7 @@ public class ChromeBrowserInitializer {
|
| // C++ startup to run asynchonously, and set it up to start the Java queue once
|
| // it has finished.
|
| startChromeBrowserProcessesAsync(
|
| + delegate.shouldStartGpuProcess(),
|
| new BrowserStartupController.StartupCallback() {
|
| @Override
|
| public void onFailure() {
|
| @@ -335,12 +335,13 @@ public class ChromeBrowserInitializer {
|
| }
|
|
|
| private void startChromeBrowserProcessesAsync(
|
| + boolean startGpuProcess,
|
| BrowserStartupController.StartupCallback callback) throws ProcessInitException {
|
| try {
|
| TraceEvent.begin("ChromeBrowserInitializer.startChromeBrowserProcessesAsync");
|
| mApplication.registerPolicyProviders(CombinedPolicyProvider.get());
|
| BrowserStartupController.get(mApplication, LibraryProcessType.PROCESS_BROWSER)
|
| - .startBrowserProcessesAsync(callback);
|
| + .startBrowserProcessesAsync(startGpuProcess, callback);
|
| } finally {
|
| TraceEvent.end("ChromeBrowserInitializer.startChromeBrowserProcessesAsync");
|
| }
|
|
|