sync: Remove ModelTypeInvalidationMap

sync/sessions/nudge_tracker.cc

 // Copyright (c) 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.
 
 #include "sync/sessions/nudge_tracker.h"
 
 #include "base/basictypes.h"
 #include "sync/internal_api/public/base/invalidation.h"
+#include "sync/notifier/invalidation_util.h"
+#include "sync/notifier/object_id_invalidation_map.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
 namespace sessions {
 
 size_t NudgeTracker::kDefaultMaxPayloadsPerType = 10;
 
 NudgeTracker::NudgeTracker()
     : updates_source_(sync_pb::GetUpdatesCallerInfo::UNKNOWN),
       invalidations_enabled_(false),
@@ skipping 65 matching lines @@
     updates_source_ = sync_pb::GetUpdatesCallerInfo::DATATYPE_REFRESH;
   }
 
   for (ModelTypeSet::Iterator it = types.First(); it.Good(); it.Inc()) {
     DCHECK(type_trackers_.find(it.Get()) != type_trackers_.end());
     type_trackers_[it.Get()].RecordLocalRefreshRequest();
   }
 }
 
 void NudgeTracker::RecordRemoteInvalidation(
-    const ModelTypeInvalidationMap& invalidation_map) {
+    const ObjectIdInvalidationMap& invalidation_map) {
   updates_source_ = sync_pb::GetUpdatesCallerInfo::NOTIFICATION;
 
-  for (ModelTypeInvalidationMap::const_iterator i = invalidation_map.begin();
-       i != invalidation_map.end(); ++i) {
-    const ModelType type = i->first;
-    const std::string& payload = i->second.payload;
+  for (ObjectIdInvalidationMap::const_iterator it = invalidation_map.begin();
+       it != invalidation_map.end(); ++it) {
+    ModelType type;
+    if (!ObjectIdToRealModelType(it->first, &type)) {
+      NOTREACHED()
+          << "Object ID " << ObjectIdToString(it->first)
+          << " does not map to valid model type";
+    }
     DCHECK(type_trackers_.find(type) != type_trackers_.end());
-    type_trackers_[type].RecordRemoteInvalidation(payload);
+    type_trackers_[type].RecordRemoteInvalidation(it->second.payload);
   }
 }
 
 void NudgeTracker::OnInvalidationsEnabled() {
   invalidations_enabled_ = true;
 }
 
 void NudgeTracker::OnInvalidationsDisabled() {
   invalidations_enabled_ = false;
   invalidations_out_of_sync_ = true;
@@ skipping 88 matching lines @@
 
 void NudgeTracker::SetHintBufferSize(size_t size) {
   for (TypeTrackerMap::iterator it = type_trackers_.begin();
        it != type_trackers_.end(); ++it) {
     it->second.UpdatePayloadBufferSize(size);
   }
 }
 
 }  // namespace sessions
 }  // namespace syncer