Refactor common invalidation framework types

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 a3d58d0658fe554d4366c3b96e714a3197393eec..546ccdd2a13e447391627acdd766c2136c07cf72 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -118,10 +118,9 @@ 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);
+  syncer::ObjectIdInvalidationMap object_ids_with_states;
+  object_ids_with_states.Insert(
+      syncer::Invalidation::Init(object_id, version, state));

[Steve Condie, 2013/10/01 18:53:10]

It is possible for the version coming from the Java code to be
ipc::invalidation::Constants::UNKNOWN, in which case this invalidation should be
initialized with InitUnknownVersion.

[rlarocque, 2013/10/01 19:29:57]

Thanks for double-checking this.

The compiler also caught this because kUnknownVersion is no longer defined, so
it choked on line 109.  This was another bad rebase on my part.  It should be
fixed in the latest patch.

 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,