Enable invalidations for arbitrary objects on Android.

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 76 matching lines @@
   if (sync_service_->HasObserver(this)) {
     sync_service_->RemoveObserver(this);
   }
 }
 
 ProfileSyncServiceAndroid::~ProfileSyncServiceAndroid() {
   RemoveObserver();
 }
 
 void ProfileSyncServiceAndroid::SendNudgeNotification(
+    int object_source,
     const std::string& str_object_id,
     int64 version,
     const std::string& state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // TODO(nileshagrawal): Merge this with ChromeInvalidationClient::Invalidate.
   // Construct the ModelTypeStateMap and send it over with the notification.
   invalidation::ObjectId object_id(
-      ipc::invalidation::ObjectSource::CHROME_SYNC,
+      object_source,
       str_object_id);
-  if (version != ipc::invalidation::Constants::UNKNOWN) {
+  if (version == ipc::invalidation::Constants::UNKNOWN) {
+    version = syncer::Invalidation::kUnknownVersion;
+  } else {
     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;
   }
 
@@ skipping 357 matching lines @@
     JNIEnv* env, jobject obj) {
   // Use profile preferences here instead of SyncPrefs to avoid an extra
   // conversion, since SyncPrefs::GetLastSyncedTime() converts the stored value
   // to to base::Time.
   return static_cast<jlong>(
       profile_->GetPrefs()->GetInt64(prefs::kSyncLastSyncedTime));
 }
 
 void ProfileSyncServiceAndroid::NudgeSyncer(JNIEnv* env,
                                             jobject obj,
+                                            jint objectSource,
                                             jstring objectId,
                                             jlong version,
                                             jstring state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  SendNudgeNotification(ConvertJavaStringToUTF8(env, objectId), version,
-                        ConvertJavaStringToUTF8(env, state));
+  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;
   content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_SYNC_REFRESH_REMOTE,
         content::Source<Profile>(profile_),
         content::Details<const syncer::ObjectIdInvalidationMap>(
@@ skipping 12 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);
 }