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..19f94ec92f41434f3db1c61db3c7fc48a6b487a1 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -105,8 +105,10 @@ void ProfileSyncServiceAndroid::SendNudgeNotification(
   invalidation::ObjectId object_id(
       object_source,
       str_object_id);
+  syncer::ObjectIdInvalidationMap object_ids_with_states;
   if (version == ipc::invalidation::Constants::UNKNOWN) {
-    version = syncer::Invalidation::kUnknownVersion;
+    object_ids_with_states.Insert(
+        syncer::Invalidation::InitUnknownVersion(object_id));
   } else {
     ObjectIdVersionMap::iterator it =
         max_invalidation_versions_.find(object_id);
@@ -116,13 +118,10 @@ void ProfileSyncServiceAndroid::SendNudgeNotification(
       return;
     }
     max_invalidation_versions_[object_id] = version;
+    object_ids_with_states.Insert(
+        syncer::Invalidation::Init(object_id, version, state));
   }
 
-  syncer::ObjectIdSet object_ids;
-  object_ids.insert(object_id);
-  syncer::ObjectIdInvalidationMap object_ids_with_states =
-      syncer::ObjectIdSetToInvalidationMap(object_ids, version, state);
-
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
       content::Source<Profile>(profile_),