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

chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromeBrowserSyncAdapterTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromeBrowserSyncAdapterTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromeBrowserSyncAdapterTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromeBrowserSyncAdapterTest.java
index c56a6bca5ed0bf2b31442e533f5e8f991bee402d..de7eb191b74b782a6434d0fca356ba7893b9ffd2 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromeBrowserSyncAdapterTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromeBrowserSyncAdapterTest.java
@@ -17,6 +17,7 @@ import org.chromium.base.CommandLine;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.components.invalidation.PendingInvalidation;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.sync.AndroidSyncSettings;
@@ -54,6 +55,10 @@ public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<Chr
                 }, WAIT_FOR_LAUNCHER_MS, POLL_INTERVAL_MS));
     }
 
+    private void performSyncWithBundle(Bundle bundle) {
+        mSyncAdapter.onPerformSync(TEST_ACCOUNT, bundle,
+                AndroidSyncSettings.getContractAuthority(getActivity()), null, new SyncResult());
+    }
 
     private static class TestChromeSyncAdapter extends ChromiumSyncAdapter {
         private boolean mSyncRequested;
@@ -73,17 +78,17 @@ public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<Chr
         }
 
         @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) {
+                mSyncRequestedForAllTypes = true;
+            } else {
+                mSyncRequested = true;
+            }
         }
     }
 
@@ -102,9 +107,7 @@ public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<Chr
     @MediumTest
     @Feature({"Sync"})
     public void testRequestSyncNoInvalidationData() {
-        SyncResult syncResult = new SyncResult();
-        mSyncAdapter.onPerformSync(TEST_ACCOUNT, new Bundle(),
-                AndroidSyncSettings.getContractAuthority(getActivity()), null, syncResult);
+        performSyncWithBundle(new Bundle());
         assertTrue(mSyncAdapter.mSyncRequestedForAllTypes);
         assertFalse(mSyncAdapter.mSyncRequested);
         assertTrue(CommandLine.isInitialized());
@@ -113,20 +116,20 @@ public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<Chr
     @MediumTest
     @Feature({"Sync"})
     public void testRequestSyncSpecificDataType() {
-        SyncResult syncResult = new SyncResult();
-        Bundle extras = new Bundle();
-        extras.putInt(ChromiumSyncAdapter.INVALIDATION_OBJECT_SOURCE_KEY, 65);
-        extras.putString(ChromiumSyncAdapter.INVALIDATION_OBJECT_ID_KEY, "objectid_value");
-        extras.putLong(ChromiumSyncAdapter.INVALIDATION_VERSION_KEY, 42);
-        extras.putString(ChromiumSyncAdapter.INVALIDATION_PAYLOAD_KEY, "payload_value");
-        mSyncAdapter.onPerformSync(TEST_ACCOUNT, extras,
-                AndroidSyncSettings.getContractAuthority(getActivity()), null, syncResult);
+        final String objectId = "objectid_value";

[nyquist, 2015/05/22 20:21:07]

Nit: unnecessary final

[knn, 2015/06/04 18:23:29]

Done.

+        final int objectSource = 65;
+        final long version = 42L;
+        final String payload = "payload_value";
+
+        performSyncWithBundle(
+                new PendingInvalidation(objectId, objectSource, version, payload).toBundle());
+
         assertFalse(mSyncAdapter.mSyncRequestedForAllTypes);
         assertTrue(mSyncAdapter.mSyncRequested);
-        assertEquals(65, mSyncAdapter.mObjectSource);
-        assertEquals("objectid_value", mSyncAdapter.mObjectId);
-        assertEquals(42, mSyncAdapter.mVersion);
-        assertEquals("payload_value", mSyncAdapter.mPayload);
+        assertEquals(objectSource, mSyncAdapter.mObjectSource);
+        assertEquals(objectId, mSyncAdapter.mObjectId);
+        assertEquals(version, mSyncAdapter.mVersion);
+        assertEquals(payload, mSyncAdapter.mPayload);
         assertTrue(CommandLine.isInitialized());
     }
 
@@ -134,9 +137,7 @@ public class ChromeBrowserSyncAdapterTest extends ChromeActivityTestCaseBase<Chr
     @Feature({"Sync"})
     public void testRequestSyncWhenChromeInBackground() throws InterruptedException {
         sendChromeToBackground(getActivity());
-        SyncResult syncResult = new SyncResult();
-        mSyncAdapter.onPerformSync(TEST_ACCOUNT, new Bundle(),
-                AndroidSyncSettings.getContractAuthority(getActivity()), null, syncResult);
+        performSyncWithBundle(new Bundle());
         assertFalse(mSyncAdapter.mSyncRequestedForAllTypes);
         assertFalse(mSyncAdapter.mSyncRequested);
     }