Register sync session ID in SyncController.

chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.sync;
 
 import android.accounts.Account;
 import android.app.Activity;
 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;
 import org.chromium.sync.AndroidSyncSettings;
 import org.chromium.sync.signin.AccountManagerHelper;
 import org.chromium.sync.signin.ChromeSigninController;
 
 /**
  * SyncController handles the coordination of sync state between the invalidation controller,
  * the Android sync settings, and the native sync code.
@@ skipping 30 matching lines @@
     private SyncNotificationController mSyncNotificationController = null;
 
     private SyncController(Context context) {
         mContext = context;
         mChromeSigninController = ChromeSigninController.get(mContext);
         mAndroidSyncSettings = AndroidSyncSettings.get(context);
         mAndroidSyncSettings.registerObserver(this);
         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 anyways so I re-wrote it.

+        // instead of using the instance we just created.
+        mProfileSyncService.setSessionsId(
+                UniqueIdentificationGeneratorFactory.getInstance(GENERATOR_ID));
     }
 
     /**
      * Retrieve the singleton instance of this class.
      *
      * @param context the current context.
      * @return the singleton instance.
      */
     public static SyncController get(Context context) {
         ThreadUtils.assertOnUiThread();
@@ skipping 131 matching lines @@
         mProfileSyncService.addSyncStateChangedListener(mSyncNotificationController);
     }
 
     /**
      * Returns the SyncNotificationController.
      */
     public SyncNotificationController getSyncNotificationController() {
         return mSyncNotificationController;
     }
 }