[Sync] Fix invalidations on Android.

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.content.SharedPreferences;
@@ skipping 64 matching lines @@
     private boolean mFirstActivityStarted = false;
 
     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();
+
         // Set the sessions ID using the generator that was registered for GENERATOR_ID.
         mProfileSyncService.setSessionsId(
                 UniqueIdentificationGeneratorFactory.getInstance(GENERATOR_ID));
 
         // Create the SyncNotificationController.
         mSyncNotificationController = new SyncNotificationController(
                 mContext, PassphraseActivity.class, AccountManagementFragment.class);
         mProfileSyncService.addSyncStateChangedListener(mSyncNotificationController);
 
         updateSyncStateFromAndroid();
@@ skipping 160 matching lines @@
             mProfileSyncService.setSyncSetupCompleted();
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
             if (prefs.getBoolean(DELAY_SYNC_SETUP_PREF, false)) {
                 mProfileSyncService.setSetupInProgress(false);
             }
         }
     }
 
     private void onFirstStart() {
         if (mAndroidSyncSettings.isSyncEnabled()) {
-            mChromeSigninController.ensureGcmIsInitialized();
             InvalidationController controller = InvalidationController.get(mContext);
             controller.refreshRegisteredTypes(mProfileSyncService.getPreferredDataTypes());
         }
         mFirstActivityStarted = true;
     }
 }