Massive refactor of the Android invalidation code.

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

 // Copyright 2013 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.content.Context;
 import android.util.Log;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator;
+import org.chromium.chrome.browser.invalidation.InvalidationServiceFactory;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.sync.internal_api.pub.SyncDecryptionPassphraseType;
 import org.chromium.sync.internal_api.pub.base.ModelType;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Android wrapper of the ProfileSyncService which provides access from the Java layer.
  * <p/>
  * This class mostly wraps native classes, but it make a few business logic decisions, both in Java
  * and in native.
  * <p/>
  * Only usable from the UI thread as the native ProfileSyncService requires its access to be in the
  * UI thread.
  * <p/>
  * See chrome/browser/sync/profile_sync_service.h for more details.
  */
 public class ProfileSyncService {
 
+    /**
+     * Listener for the underlying sync status.
+     */
     public interface SyncStateChangedListener {
-        // Invoked when the underlying sync status has changed.
+        // Invoked when the status has changed.
         public void syncStateChanged();
     }
 
     private static final String TAG = "ProfileSyncService";
 
     @VisibleForTesting
     public static final String SESSION_TAG_PREFIX = "session_sync";
 
     private static ProfileSyncService sSyncSetupManager;
 
@@ skipping 81 matching lines @@
      *
      * @param account   The username of the account that is signing in.
      * @param authToken Not used. ProfileSyncService switched to OAuth2 tokens.
      * Deprecated. Use syncSignIn instead.
      */
     @Deprecated
     public void syncSignInWithAuthToken(String account, String authToken) {
         syncSignIn(account);
     }
 
-    public void requestSyncFromNativeChrome(
-            int objectSource, String objectId, long version, String payload) {
-        ThreadUtils.assertOnUiThread();
-        nativeNudgeSyncer(
-                mNativeProfileSyncServiceAndroid, objectSource, objectId, version, payload);
-    }
-
+    // TODO(maxbogue): Remove once downstream use is removed. See http://crbug.com/259559.
+    // Callers should use InvalidationService.requestSyncFromNativeChromeForAllTypes() instead.
+    @Deprecated
     public void requestSyncFromNativeChromeForAllTypes() {
         ThreadUtils.assertOnUiThread();
-        nativeNudgeSyncerForAllTypes(mNativeProfileSyncServiceAndroid);
-    }
-
-    /**
-     * Nudge the syncer to start a new sync cycle.
-     */
-    @VisibleForTesting
-    public void requestSyncCycleForTest() {
-        ThreadUtils.assertOnUiThread();
-        requestSyncFromNativeChromeForAllTypes();
+        InvalidationServiceFactory.getForProfile(Profile.getLastUsedProfile())
+                .requestSyncFromNativeChromeForAllTypes();
     }
 
     public String querySyncStatus() {
         ThreadUtils.assertOnUiThread();
         return nativeQuerySyncStatusSummary(mNativeProfileSyncServiceAndroid);
     }
 
     /**
      * Sets the the machine tag used by session sync to a unique value.
      */
@@ skipping 368 matching lines @@
             sb.append(it.next());
             while (it.hasNext()) {
                 sb.append(", ");
                 sb.append(it.next());
             }
         }
         return sb.toString();
     }
 
     // Native methods
-    private native void nativeNudgeSyncer(
-            long nativeProfileSyncServiceAndroid, int objectSource, String objectId, long version,
-            String payload);
-    private native void nativeNudgeSyncerForAllTypes(long nativeProfileSyncServiceAndroid);
     private native long nativeInit();
     private native void nativeEnableSync(long nativeProfileSyncServiceAndroid);
     private native void nativeDisableSync(long nativeProfileSyncServiceAndroid);
     private native void nativeSignInSync(long nativeProfileSyncServiceAndroid);
     private native void nativeSignOutSync(long nativeProfileSyncServiceAndroid);
     private native boolean nativeSetSyncSessionsId(
             long nativeProfileSyncServiceAndroid, String tag);
     private native String nativeQuerySyncStatusSummary(long nativeProfileSyncServiceAndroid);
     private native int nativeGetAuthError(long nativeProfileSyncServiceAndroid);
     private native boolean nativeIsSyncInitialized(long nativeProfileSyncServiceAndroid);
@@ skipping 29 matching lines @@
     private native void nativeSetSyncSetupCompleted(long nativeProfileSyncServiceAndroid);
     private native boolean nativeHasSyncSetupCompleted(long nativeProfileSyncServiceAndroid);
     private native boolean nativeIsStartSuppressed(long nativeProfileSyncServiceAndroid);
     private native boolean nativeHasKeepEverythingSynced(long nativeProfileSyncServiceAndroid);
     private native boolean nativeHasUnrecoverableError(long nativeProfileSyncServiceAndroid);
     private native String nativeGetAboutInfoForTest(long nativeProfileSyncServiceAndroid);
     private native long nativeGetLastSyncedTimeForTest(long nativeProfileSyncServiceAndroid);
     private native void nativeOverrideNetworkResourcesForTest(
             long nativeProfileSyncServiceAndroid, long networkResources);
 }