sync: Inject sync/'s dependency on invalidations

sync/sessions/nudge_tracker.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.
 //
 // A class to track the outstanding work required to bring the client back into
 // sync with the server.
 #ifndef SYNC_SESSIONS_NUDGE_TRACKER_H_
 #define SYNC_SESSIONS_NUDGE_TRACKER_H_
 
 #include <list>
 #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"
 #include "sync/sessions/data_type_tracker.h"
 
 namespace syncer {
 
 class ObjectIdInvalidationMap;
 
 namespace sessions {
@@ skipping 26 matching lines @@
   // completed successfully.
   void RecordSuccessfulSyncCycle();
 
   // Takes note of a local change.
   void RecordLocalChange(ModelTypeSet types);
 
   // Takes note of a locally issued request to refresh a data type.
   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);
 
   // These functions should be called to keep this class informed of the status
   // of the connection to the invalidations server.
   void OnInvalidationsEnabled();
   void OnInvalidationsDisabled();
 
   // Marks |types| as being throttled from |now| until |now| + |length|.
   void SetTypesThrottledUntil(ModelTypeSet types,
                               base::TimeDelta length,
                               base::TimeTicks now);
@@ skipping 58 matching lines @@
   // This is a request sent to us as part of a server response requesting
   // that the client perform a GetUpdate request at |next_retry_time| to
   // fetch any updates it may have missed in the first attempt.
   //
   // To avoid strange results from IsRetryRequired() during a sync cycle, the
   // effects of this change are not guaranteed to take effect until
   // SetSyncCycleStartTime() is called at the start of the *next* sync cycle.
   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.
   sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source_;
 
   // Tracks whether or not invalidations are currently enabled.
   bool invalidations_enabled_;
 
   // This flag is set if suspect that some technical malfunction or known bug
   // may have left us with some unserviced invalidations.
@@ skipping 27 matching lines @@
   // currently in a sync cycle.
   base::TimeTicks sync_cycle_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(NudgeTracker);
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_NUDGE_TRACKER_H_