Massive refactor of the Android invalidation code.

chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.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.accounts.Account;
 import android.app.Application;
 import android.content.AbstractThreadedSyncAdapter;
 import android.content.ContentProviderClient;
 import android.content.Context;
 import android.content.SyncResult;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 
 import com.google.common.annotations.VisibleForTesting;
 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;
 
 /**
  * A sync adapter for Chromium.
  */
 public abstract class ChromiumSyncAdapter extends AbstractThreadedSyncAdapter {
     private static final String TAG = "ChromiumSyncAdapter";
 
@@ skipping 129 matching lines @@
                 DelayedSyncController.getInstance().setDelayedSync(context, acct.name);
                 // Using numIoExceptions so Android will treat this as a soft error.
                 syncResult.stats.numIoExceptions++;
                 semaphore.release();
             }
         };
     }
 
     @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();
     }
 }