Invalidation trickles mega-patch

chrome/browser/sync/profile_sync_service_android.cc

Index: chrome/browser/sync/profile_sync_service_android.cc
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index 2eb88ea45c7179c14ac800c579f1c1b558fbff0e..46e9c9c3863761d2787878cc02e9c6fba5cbf6b2 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -118,16 +118,14 @@ void ProfileSyncServiceAndroid::SendNudgeNotification(
     max_invalidation_versions_[object_id] = version;
   }
 
-  syncer::ObjectIdSet object_ids;
-  object_ids.insert(object_id);
-  syncer::ObjectIdInvalidationMap object_ids_with_states =
-      syncer::ObjectIdSetToInvalidationMap(object_ids, version, state);
+  InvalidationMap invalidation_map;
+  invalidationMap.Insert(Invalidation::Init(object_id, version, state));
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
       content::Source<Profile>(profile_),
       content::Details<const syncer::ObjectIdInvalidationMap>(
-          &object_ids_with_states));
+          &invalidation_map));
 }
 
 void ProfileSyncServiceAndroid::OnStateChanged() {
@@ -497,12 +495,12 @@ void ProfileSyncServiceAndroid::NudgeSyncer(JNIEnv* env,
 void ProfileSyncServiceAndroid::NudgeSyncerForAllTypes(JNIEnv* env,
                                                        jobject obj) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  syncer::ObjectIdInvalidationMap object_ids_with_states;
+  syncer::InvalidationMap empty_invalidations;
   content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
         content::Source<Profile>(profile_),
         content::Details<const syncer::ObjectIdInvalidationMap>(
-            &object_ids_with_states));
+            &empty_invalidations));
 }
 
 // static