[Android] Only invalidate objects that were received from Tango on resume.

components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java

Index: components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java
diff --git a/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java b/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java
index e8bf675789d74a0126ac24b3d9f814401688f74f..96963ad3abb6eea5c57b1b8813bd61cc3fe346cf 100644
--- a/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java
+++ b/components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationService.java
@@ -8,6 +8,8 @@ import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 
+import com.google.protos.ipc.invalidation.Types;
+
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
@@ -35,16 +37,15 @@ public class InvalidationService {
         mNativeInvalidationServiceAndroid = nativeInvalidationServiceAndroid;
     }
 
-    public void requestSyncFromNativeChrome(
+    public void notifyInvalidationToNativeChrome(
             int objectSource, String objectId, long version, String payload) {
         ThreadUtils.assertOnUiThread();
-        nativeRequestSync(
+        nativeInvalidate(
                 mNativeInvalidationServiceAndroid, objectSource, objectId, version, payload);
     }
 
     public void requestSyncFromNativeChromeForAllTypes() {
-        ThreadUtils.assertOnUiThread();
-        nativeRequestSyncForAllTypes(mNativeInvalidationServiceAndroid);
+        notifyInvalidationToNativeChrome(Types.ObjectSource.CHROME_SYNC, null, 0L, null);
     }
 
     @CalledByNative
@@ -66,9 +67,8 @@ public class InvalidationService {
     public void setRegisteredObjectIds(int[] objectSources, String[] objectNames) {
         InvalidationPreferences invalidationPreferences = new InvalidationPreferences(mContext);
         Account account = invalidationPreferences.getSavedSyncedAccount();
-        Intent registerIntent =
-                InvalidationIntentProtocol.createRegisterIntent(
-                        account, objectSources, objectNames);
+        Intent registerIntent = InvalidationIntentProtocol.createRegisterIntent(
+                account, objectSources, objectNames);
         registerIntent.setClass(mContext, InvalidationClientService.class);
         mContext.startService(registerIntent);
     }
@@ -85,7 +85,6 @@ public class InvalidationService {
         return InvalidationClientNameProvider.get().getInvalidatorClientName();
     }
 
-    private native void nativeRequestSync(long nativeInvalidationServiceAndroid,
-            int objectSource, String objectId, long version, String payload);
-    private native void nativeRequestSyncForAllTypes(long nativeInvalidationServiceAndroid);
+    private native void nativeInvalidate(long nativeInvalidationServiceAndroid, int objectSource,
+            String objectId, long version, String payload);
 }