Massive refactor of the Android invalidation code.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
index c56f560e7af19b62c15351eb29215b6d8f86b8e4..0569eb5ce9a52ff58515d8888044a2f2ab7cb720 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java
@@ -19,6 +19,8 @@ import com.google.protos.ipc.invalidation.Types;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.library_loader.ProcessInitException;
+import org.chromium.chrome.browser.invalidation.InvalidationServiceFactory;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.content.browser.BrowserStartupController;
 
 import java.util.concurrent.Semaphore;
@@ -168,12 +170,13 @@ public abstract class ChromiumSyncAdapter extends AbstractThreadedSyncAdapter {
 
     @VisibleForTesting
     public void requestSync(int objectSource, String objectId, long version, String payload) {
-        ProfileSyncService.get(mApplication)
+        InvalidationServiceFactory.getForProfile(Profile.getLastUsedProfile())
                 .requestSyncFromNativeChrome(objectSource, objectId, version, payload);
     }
 
     @VisibleForTesting
     public void requestSyncForAllTypes() {
-        ProfileSyncService.get(mApplication).requestSyncFromNativeChromeForAllTypes();
+        InvalidationServiceFactory.getForProfile(Profile.getLastUsedProfile())
+                .requestSyncFromNativeChromeForAllTypes();
     }
 }