Refactor common invalidation framework types

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);
+  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,
       content::Source<Profile>(profile_),
       content::Details<const syncer::ObjectIdInvalidationMap>(
           &object_ids_with_states));
 }
 
 void ProfileSyncServiceAndroid::OnStateChanged() {
   // Notify the java world that our sync state has changed.
@@ skipping 382 matching lines @@
   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);
 }