sync: Inject sync/'s dependency on invalidations

sync/sessions/nudge_tracker.h

Index: sync/sessions/nudge_tracker.h
diff --git a/sync/sessions/nudge_tracker.h b/sync/sessions/nudge_tracker.h
index e14f31fa33628ef49417d19426a99c63080c2152..4c8d4454c79b1750108ed376d98f15479c44ad87 100644
--- a/sync/sessions/nudge_tracker.h
+++ b/sync/sessions/nudge_tracker.h
@@ -11,6 +11,7 @@
 #include <map>
 
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync.pb.h"
@@ -57,8 +58,8 @@ class SYNC_EXPORT_PRIVATE NudgeTracker {
   void RecordLocalRefreshRequest(ModelTypeSet types);
 
   // Takes note of the receipt of an invalidation notice from the server.
-  void RecordRemoteInvalidation(
-      const ObjectIdInvalidationMap& invalidation_map);
+  void RecordRemoteInvalidation(syncer::ModelType type,
+                                scoped_ptr<InvalidationInterface> invalidation);

[tim (not reviewing), 2014/06/18 22:41:11]

include invalidation_interface.h 

 
   // These functions should be called to keep this class informed of the status
   // of the connection to the invalidations server.
@@ -137,9 +138,10 @@ class SYNC_EXPORT_PRIVATE NudgeTracker {
   void SetNextRetryTime(base::TimeTicks next_retry_time);
 
  private:
-  typedef std::map<ModelType, DataTypeTracker> TypeTrackerMap;
+  typedef std::map<ModelType, DataTypeTracker*> TypeTrackerMap;
 
   TypeTrackerMap type_trackers_;
+  STLValueDeleter<TypeTrackerMap> type_tracker_deleter_;
 
   // Merged updates source.  This should be obsolete, but the server still
   // relies on it for some heuristics.