| Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
|
| index e4b0746b40b81de3ed9056cf9ffa00e4c8a5c0aa..dbb527a6b775ec6328df3d6228500efb8d35d71c 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
|
| @@ -21,6 +21,7 @@ import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.VisibleForTesting;
|
| import org.chromium.base.annotations.SuppressFBWarnings;
|
| import org.chromium.base.library_loader.ProcessInitException;
|
| +import org.chromium.chrome.browser.ChromeBrowserStartupController;
|
| import org.chromium.chrome.browser.invalidation.InvalidationServiceFactory;
|
| import org.chromium.chrome.browser.profiles.Profile;
|
| import org.chromium.content.app.ContentApplication;
|
| @@ -108,7 +109,7 @@ public abstract class ChromiumSyncAdapter extends AbstractThreadedSyncAdapter {
|
| ContentApplication.initCommandLine(getContext());
|
| if (mAsyncStartup) {
|
| try {
|
| - BrowserStartupController.get(mApplication)
|
| + ChromeBrowserStartupController.get(mApplication)
|
| .startBrowserProcessesAsync(callback);
|
| } catch (ProcessInitException e) {
|
| Log.e(TAG, "Unable to load native library.", e);
|
| @@ -132,7 +133,7 @@ public abstract class ChromiumSyncAdapter extends AbstractThreadedSyncAdapter {
|
| private void startBrowserProcessesSync(
|
| final BrowserStartupController.StartupCallback callback) {
|
| try {
|
| - BrowserStartupController.get(mApplication).startBrowserProcessesSync(false);
|
| + ChromeBrowserStartupController.get(mApplication).startBrowserProcessesSync(false);
|
| } catch (ProcessInitException e) {
|
| Log.e(TAG, "Unable to load native library.", e);
|
| System.exit(-1);
|
|
|