Invalidation trickles mega-patch

sync/notifier/invalidation_notifier.h

Index: sync/notifier/invalidation_notifier.h
diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
index b7a98f8881047107255f7d8bfab70376e0ca38c0..7ed15a57b78d83b769f5302e2ef43341aa50d235 100644
--- a/sync/notifier/invalidation_notifier.h
+++ b/sync/notifier/invalidation_notifier.h
@@ -34,7 +34,6 @@ class PushClient;
 namespace syncer {
 
 // This class must live on the IO thread.
-// TODO(dcheng): Think of a name better than InvalidationInvalidator.
 class SYNC_EXPORT_PRIVATE InvalidationNotifier
     : public Invalidator,
       public SyncInvalidationListener::Delegate,
@@ -44,7 +43,7 @@ class SYNC_EXPORT_PRIVATE InvalidationNotifier
   InvalidationNotifier(
       scoped_ptr<notifier::PushClient> push_client,
       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,
@@ -57,8 +56,6 @@ class SYNC_EXPORT_PRIVATE InvalidationNotifier
   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;
@@ -83,7 +80,7 @@ class SYNC_EXPORT_PRIVATE InvalidationNotifier
   InvalidatorRegistrar registrar_;
 
   // Passed to |invalidation_listener_|.
-  const InvalidationStateMap initial_invalidation_state_map_;
+  const UnackedInvalidationStorageMap saved_invalidations_;
 
   // Passed to |invalidation_listener_|.
   const WeakHandle<InvalidationStateTracker>
@@ -98,10 +95,6 @@ class SYNC_EXPORT_PRIVATE InvalidationNotifier
   // The initial bootstrap data to pass to |invalidation_listener_|.
   const std::string invalidation_bootstrap_data_;
 
-  // TODO(akalin): Clean up this reference to DefaultTickClock. Ideally, we
-  // should simply be using TaskRunner's tick clock. See http://crbug.com/179211
-  base::DefaultTickClock tick_clock_;
-
   // The invalidation listener.
   SyncInvalidationListener invalidation_listener_;