Invalidation trickles mega-patch

chrome/browser/sync/profile_sync_service_android.cc

 // 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.
 
 #include "chrome/browser/sync/profile_sync_service_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 100 matching lines @@
     ObjectIdVersionMap::iterator it =
         max_invalidation_versions_.find(object_id);
     if ((it != max_invalidation_versions_.end()) &&
         (version <= it->second)) {
       DVLOG(1) << "Dropping redundant invalidation with version " << version;
       return;
     }
     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() {
   // Notify the java world that our sync state has changed.
   JNIEnv* env = AttachCurrentThread();
   Java_ProfileSyncService_syncStateChanged(
       env, weak_java_profile_sync_service_.get(env).obj());
 }
 
 void ProfileSyncServiceAndroid::TokenAvailable(
@@ skipping 349 matching lines @@
                                             jlong version,
                                             jstring state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   SendNudgeNotification(objectSource, ConvertJavaStringToUTF8(env, objectId),
                         version, ConvertJavaStringToUTF8(env, state));
 }
 
 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
 ProfileSyncServiceAndroid*
     ProfileSyncServiceAndroid::GetProfileSyncServiceAndroid() {
   return reinterpret_cast<ProfileSyncServiceAndroid*>(
           Java_ProfileSyncService_getProfileSyncServiceAndroid(
       AttachCurrentThread(), base::android::GetApplicationContext()));
 }
 
 static int Init(JNIEnv* env, jobject obj) {
   ProfileSyncServiceAndroid* profile_sync_service_android =
       new ProfileSyncServiceAndroid(env, obj);
   profile_sync_service_android->Init();
   return reinterpret_cast<jint>(profile_sync_service_android);
 }
 
 // static
 bool ProfileSyncServiceAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }