Massive refactor of the Android invalidation code.

chrome/browser/sync/profile_sync_service_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_
 
 #include <jni.h>
 #include <map>
 
@@ skipping 16 matching lines @@
 // ProfileSyncService.
 // This class should only be accessed from the UI thread.
 class ProfileSyncServiceAndroid : public ProfileSyncServiceObserver {
  public:
 
   ProfileSyncServiceAndroid(JNIEnv* env, jobject obj);
 
   // This method should be called once right after contructing the object.
   void Init();
 
-  // Called from Java when we need to nudge native syncer. The |objectSource|,
-  // |objectId|, |version| and |payload| values should come from an
-  // invalidation.
-  void NudgeSyncer(JNIEnv* env,
-                   jobject obj,
-                   jint objectSource,
-                   jstring objectId,
-                   jlong version,
-                   jstring payload);
-
-  // Called from Java when we need to nudge native syncer but have lost state on
-  // which types have changed.
-  void NudgeSyncerForAllTypes(JNIEnv* env, jobject obj);
-
   // Called from Java when the user manually enables sync
   void EnableSync(JNIEnv* env, jobject obj);
 
   // Called from Java when the user manually disables sync
   void DisableSync(JNIEnv* env, jobject obj);
 
   // Called from Java when the user signs in to Chrome. Starts up sync.
   void SignInSync(JNIEnv* env, jobject obj);
 
   // Called from Java when the user signs out of Chrome
@@ skipping 157 matching lines @@
   static bool Register(JNIEnv* env);
 
  private:
   typedef std::map<invalidation::ObjectId,
                    int64,
                    syncer::ObjectIdLessThan> ObjectIdVersionMap;
 
   virtual ~ProfileSyncServiceAndroid();
   // Remove observers to profile sync service.
   void RemoveObserver();
-  // Called from Java when we need to nudge native syncer. The |object_source|,
-  // |objectId|, |version| and |payload| values should come from an
-  // invalidation.
-  void SendNudgeNotification(int object_source,
-                             const std::string& str_object_id,
-                             int64 version,
-                             const std::string& payload);
 
   Profile* profile_;
   ProfileSyncService* sync_service_;
   // The class that handles getting, setting, and persisting sync
   // preferences.
   scoped_ptr<sync_driver::SyncPrefs> sync_prefs_;
 
   // Java-side ProfileSyncService object.
   JavaObjectWeakGlobalRef weak_java_profile_sync_service_;
 
-  // The invalidation API spec allows for the possibility of redundant
-  // invalidations, so keep track of the max versions and drop
-  // invalidations with old versions.
-  ObjectIdVersionMap max_invalidation_versions_;
-
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceAndroid);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_ANDROID_H_