sync: Remove ModelTypeInvalidationMap

sync/internal_api/debug_info_event_listener.cc

Index: sync/internal_api/debug_info_event_listener.cc
diff --git a/sync/internal_api/debug_info_event_listener.cc b/sync/internal_api/debug_info_event_listener.cc
index 66953d4f63699a44874353fc3b5dca58a7d64cc9..4f0ddbc788f06c6e2a33696ab1ec3dfb81cebe8a 100644
--- a/sync/internal_api/debug_info_event_listener.cc
+++ b/sync/internal_api/debug_info_event_listener.cc
@@ -4,6 +4,7 @@
 
 #include "sync/internal_api/debug_info_event_listener.h"
 
+#include "sync/notifier/object_id_invalidation_map.h"
 #include "sync/util/cryptographer.h"
 
 namespace syncer {
@@ -134,14 +135,19 @@ void DebugInfoEventListener::OnNudgeFromDatatype(ModelType datatype) {
 }
 
 void DebugInfoEventListener::OnIncomingNotification(
-     const ModelTypeInvalidationMap& invalidation_map) {
+    const ObjectIdInvalidationMap& invalidations) {
   DCHECK(thread_checker_.CalledOnValidThread());
   sync_pb::DebugEventInfo event_info;
-  ModelTypeSet types = ModelTypeInvalidationMapToSet(invalidation_map);
-
-  for (ModelTypeSet::Iterator it = types.First(); it.Good(); it.Inc()) {
-    event_info.add_datatypes_notified_from_server(
-        GetSpecificsFieldNumberFromModelType(it.Get()));
+  ModelTypeSet types = ObjectIdSetToModelTypeSet(ObjectIdInvalidationMapToSet(
+          invalidations));
+
+  for (ObjectIdInvalidationMap::const_iterator it = invalidations.begin();
+       it != invalidations.end(); ++it) {
+    ModelType type;

[tim (not reviewing), 2013/08/28 00:13:00]

nit - init to UNSPECIFIED.

[rlarocque, 2013/08/28 01:00:35]

Done.

+    if (ObjectIdToRealModelType(it->first, &type)) {

[tim (not reviewing), 2013/08/28 00:13:00]

LOG(ERROR) if this fails (or some LOG variant)?

[rlarocque, 2013/08/28 01:00:35]

Done.  I used DLOG(ERROR).

[tim (not reviewing), 2013/08/28 01:11:07]

There were a few other places I noticed where we call ObjectIdToRealModelType
and don't handle the error case; was that intended? e.g
sync_manager_impl.cc:1158

[rlarocque, 2013/08/28 17:50:22]

I think I was consistently ignoring the error, which is what I had thought the
ObjectIdInvalidationMap to ModelTypeInvalidationMap conversion did.  Turns out
it printed logs if anything went wrong.

I think I can do better than that, though.  I'll remove the logging here, and
add a DLOG(WARNING) at the beginning of OnNotificationReceived.  This should
make it similar to the old check, but it will only notify once per invalidation
sent.

+      event_info.add_datatypes_notified_from_server(
+          GetSpecificsFieldNumberFromModelType(type));
+    }
   }
 
   AddEventToQueue(event_info);