Invalidation trickles mega-patch

sync/notifier/non_blocking_invalidator.h

Index: sync/notifier/non_blocking_invalidator.h
diff --git a/sync/notifier/non_blocking_invalidator.h b/sync/notifier/non_blocking_invalidator.h
index f2685c702d2f14a498b63050ce938014246d9d19..b9ab5c90c32d8554ec63fde5224c1583fb07a08b 100644
--- a/sync/notifier/non_blocking_invalidator.h
+++ b/sync/notifier/non_blocking_invalidator.h
@@ -28,8 +28,6 @@ class SingleThreadTaskRunner;
 
 namespace syncer {
 
-// TODO(akalin): Generalize the interface so it can use any Invalidator.
-// (http://crbug.com/140409).
 class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
     : public Invalidator,
       // InvalidationHandler to "observe" our Core via WeakHandle.
@@ -39,7 +37,7 @@ class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
   NonBlockingInvalidator(
       const notifier::NotifierOptions& notifier_options,
       const std::string& invalidator_client_id,
-      const InvalidationStateMap& initial_invalidation_state_map,
+      const UnackedInvalidationStorageMap& saved_invalidations,
       const std::string& invalidation_bootstrap_data,
       const WeakHandle<InvalidationStateTracker>&
           invalidation_state_tracker,
@@ -52,8 +50,6 @@ class SYNC_EXPORT_PRIVATE NonBlockingInvalidator
   virtual void UpdateRegisteredIds(InvalidationHandler* handler,
                                    const ObjectIdSet& ids) OVERRIDE;
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
-  virtual void Acknowledge(const invalidation::ObjectId& id,
-                           const AckHandle& ack_handle) OVERRIDE;
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;