Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java |
index 074c1412524b5d2b51139224a7695ad1d7352921..d955cab4efe8762cb4853b8620a90f465f253676 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java |
@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.bookmark.BookmarkColumns; |
import org.chromium.chrome.browser.bookmark.SearchColumns; |
import org.chromium.chrome.browser.database.SQLiteCursor; |
import org.chromium.chrome.browser.externalauth.ExternalAuthUtils; |
+import org.chromium.chrome.browser.init.ChromeBrowserInitializer; |
import org.chromium.content.app.ContentApplication; |
import org.chromium.content.browser.BrowserStartupController; |
import org.chromium.sync.AndroidSyncSettings; |
@@ -792,9 +793,8 @@ public class ChromeBrowserProvider extends ContentProvider { |
public void run() { |
if (mNativeChromeBrowserProvider != 0) return; |
try { |
- ((ChromeApplication) getContext().getApplicationContext()) |
- .startBrowserProcessesAndLoadLibrariesSync( |
- true /*Start GoogleServicesManager*/); |
+ ChromeBrowserInitializer.getInstance(getContext()) |
+ .handleSynchronousStartup(); |
} catch (ProcessInitException e) { |
// Chrome browser runs in the background, so exit silently; but do exit, |
// since otherwise the next attempt to use Chrome will find a broken JNI. |