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

chrome/android/javatests_shell/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java

Index: chrome/android/javatests_shell/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java
diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java
index a79a14e56ecf880c1a319f5441a4a812a683752c..6b8b4d2ba2e05b508a78e06c60ad587e7cbc4a6e 100644
--- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java
+++ b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java
@@ -12,11 +12,10 @@ import android.content.SyncResult;
 import android.os.Bundle;
 import android.test.suitebuilder.annotation.MediumTest;
 
-import com.google.protos.ipc.invalidation.Types;
-
 import org.chromium.base.CommandLine;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.shell.ChromeShellTestBase;
+import org.chromium.components.invalidation.PendingInvalidation;
 import org.chromium.sync.AndroidSyncSettings;
 import org.chromium.sync.signin.AccountManagerHelper;
 
@@ -31,8 +30,8 @@ public class ChromiumSyncAdapterTest extends ChromeShellTestBase {
     private TestChromiumSyncAdapter mSyncAdapter;
 
     private static class TestChromiumSyncAdapter extends ChromiumSyncAdapter {
-        private boolean mSyncRequested;
-        private boolean mSyncRequestedForAllTypes;
+        private boolean mInvalidated;
+        private boolean mInvalidatedAllTypes;
         private int mObjectSource;
         private String mObjectId;
         private long mVersion;
@@ -48,17 +47,17 @@ public class ChromiumSyncAdapterTest extends ChromeShellTestBase {
         }
 
         @Override
-        public void requestSync(int objectSource, String objectId, long version, String payload) {
+        public void notifyInvalidation(
+                int objectSource, String objectId, long version, String payload) {
             mObjectSource = objectSource;
             mObjectId = objectId;
             mVersion = version;
             mPayload = payload;
-            mSyncRequested = true;
-        }
-
-        @Override
-        public void requestSyncForAllTypes() {
-            mSyncRequestedForAllTypes = true;
+            if (objectId == null) {
+                mInvalidatedAllTypes = true;
+            } else {
+                mInvalidated = true;
+            }
         }
     }
 
@@ -70,7 +69,7 @@ public class ChromiumSyncAdapterTest extends ChromeShellTestBase {
                 getActivity().getApplication());
     }
 
-    public void performSyncWithBundle(Bundle bundle) {
+    private void performSyncWithBundle(Bundle bundle) {
         mSyncAdapter.onPerformSync(TEST_ACCOUNT, bundle,
                 AndroidSyncSettings.getContractAuthority(getActivity()),
                 null, new SyncResult());
@@ -80,45 +79,29 @@ public class ChromiumSyncAdapterTest extends ChromeShellTestBase {
     @Feature({"Sync"})
     public void testRequestSyncNoInvalidationData() {
         performSyncWithBundle(new Bundle());
-        assertTrue(mSyncAdapter.mSyncRequestedForAllTypes);
-        assertFalse(mSyncAdapter.mSyncRequested);
-        assertTrue(CommandLine.isInitialized());
-    }
-
-    private void testRequestSyncSpecificDataType(boolean withObjectSource) {
-        Bundle extras = new Bundle();
-        if (withObjectSource) {
-            extras.putInt(ChromiumSyncAdapter.INVALIDATION_OBJECT_SOURCE_KEY, 61);
-        }
-        extras.putString(ChromiumSyncAdapter.INVALIDATION_OBJECT_ID_KEY, "objectid_value");
-        extras.putLong(ChromiumSyncAdapter.INVALIDATION_VERSION_KEY, 42);
-        extras.putString(ChromiumSyncAdapter.INVALIDATION_PAYLOAD_KEY, "payload_value");
-
-        performSyncWithBundle(extras);
-
-        assertFalse(mSyncAdapter.mSyncRequestedForAllTypes);
-        assertTrue(mSyncAdapter.mSyncRequested);
-        if (withObjectSource) {
-            assertEquals(61, mSyncAdapter.mObjectSource);
-        } else {
-            assertEquals(Types.ObjectSource.CHROME_SYNC, mSyncAdapter.mObjectSource);
-        }
-        assertEquals("objectid_value", mSyncAdapter.mObjectId);
-        assertEquals(42, mSyncAdapter.mVersion);
-        assertEquals("payload_value", mSyncAdapter.mPayload);
+        assertTrue(mSyncAdapter.mInvalidatedAllTypes);
+        assertFalse(mSyncAdapter.mInvalidated);
         assertTrue(CommandLine.isInitialized());
     }
 
     @MediumTest
     @Feature({"Sync"})
     public void testRequestSyncSpecificDataType() {
-        testRequestSyncSpecificDataType(true /* withObjectSource */);
-    }
-
-    @MediumTest
-    @Feature({"Sync"})
-    public void testRequestSyncSpecificDataType_withoutObjectSource() {
-        testRequestSyncSpecificDataType(false /* withObjectSource */);
+        final String objectId = "objectid_value";
+        final int objectSource = 61;
+        final long version = 42L;
+        final String payload = "payload_value";
+
+        performSyncWithBundle(
+                new PendingInvalidation(objectId, objectSource, version, payload).toBundle());
+
+        assertFalse(mSyncAdapter.mInvalidatedAllTypes);
+        assertTrue(mSyncAdapter.mInvalidated);
+        assertEquals(objectSource, mSyncAdapter.mObjectSource);
+        assertEquals(objectId, mSyncAdapter.mObjectId);
+        assertEquals(version, mSyncAdapter.mVersion);
+        assertEquals(payload, mSyncAdapter.mPayload);
+        assertTrue(CommandLine.isInitialized());
     }
 
     @MediumTest
@@ -126,8 +109,8 @@ public class ChromiumSyncAdapterTest extends ChromeShellTestBase {
     public void testRequestSyncWhenChromeInBackground() throws InterruptedException {
         DelayedSyncControllerTest.sendChromeToBackground(getActivity());
         performSyncWithBundle(new Bundle());
-        assertFalse(mSyncAdapter.mSyncRequestedForAllTypes);
-        assertFalse(mSyncAdapter.mSyncRequested);
+        assertFalse(mSyncAdapter.mInvalidatedAllTypes);
+        assertFalse(mSyncAdapter.mInvalidated);
         assertTrue(CommandLine.isInitialized());
     }
 
@@ -137,7 +120,7 @@ public class ChromiumSyncAdapterTest extends ChromeShellTestBase {
         Bundle extras = new Bundle();
         extras.putBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE, true);
         performSyncWithBundle(extras);
-        assertFalse(mSyncAdapter.mSyncRequestedForAllTypes);
-        assertFalse(mSyncAdapter.mSyncRequested);
+        assertFalse(mSyncAdapter.mInvalidatedAllTypes);
+        assertFalse(mSyncAdapter.mInvalidated);
     }
 }