Index: chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java |
index e87d454488d9172630e3bedac1a3836d6d45bb2c..1dec363ec8bd06257a78f3d2d9c59e490d9729a3 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java |
@@ -10,6 +10,7 @@ import android.content.Context; |
import android.util.Log; |
import org.chromium.base.ThreadUtils; |
+import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory; |
import org.chromium.chrome.browser.invalidation.InvalidationController; |
import org.chromium.chrome.browser.signin.SigninManager; |
import org.chromium.chrome.browser.signin.SigninManager.SignInFlowObserver; |
@@ -60,6 +61,10 @@ public class SyncController implements ProfileSyncService.SyncStateChangedListen |
mProfileSyncService = ProfileSyncService.get(mContext); |
mProfileSyncService.addSyncStateChangedListener(this); |
mChromeSigninController.ensureGcmIsInitialized(); |
+ // Since we do not override the UniqueIdentificationGenerator, we get it from the factory, |
nyquist
2015/03/04 09:15:13
Do not use pronouns in comments.
maxbogue
2015/03/04 18:40:48
Hmm, that comment didn't really make sense anymore
|
+ // instead of using the instance we just created. |
+ mProfileSyncService.setSessionsId( |
+ UniqueIdentificationGeneratorFactory.getInstance(GENERATOR_ID)); |
} |
/** |