Massive refactor of the Android invalidation code.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
index 53ccdceb55169b4ad418df644d6b61048f51657c..03ebb9bc7596a2dd3222fe0a7c3faf633048c559 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
@@ -13,6 +13,8 @@ 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;
 
@@ -36,8 +38,11 @@ import java.util.concurrent.CopyOnWriteArrayList;
  */
 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();
     }
 
@@ -139,25 +144,11 @@ public class ProfileSyncService {
         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 upstream use is removed.

[nyquist, 2014/09/04 09:01:55]

s/upstream/downstream/
Also, add @Deprecated annotation and refer to the bug (just using
http://crbug.com/259559) and also say what the callers should call instead.

[maxbogue, 2014/09/05 16:42:45]

Done.

     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() {
@@ -537,10 +528,6 @@ public class ProfileSyncService {
     }
 
     // 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);