Refactor ModelTypePayloadMap and ObjectIdPayloadMap to StateMaps.

sync/notifier/invalidation_util.h

Index: sync/notifier/invalidation_util.h
diff --git a/sync/notifier/invalidation_util.h b/sync/notifier/invalidation_util.h
index bc43523cd2452e9d528813f675007ea8dce66db4..2f3198bc42a63d84ac4220360914dc9544141048 100644
--- a/sync/notifier/invalidation_util.h
+++ b/sync/notifier/invalidation_util.h
@@ -7,6 +7,7 @@
 #ifndef SYNC_NOTIFIER_INVALIDATION_UTIL_H_
 #define SYNC_NOTIFIER_INVALIDATION_UTIL_H_
 
+#include <iosfwd>
 #include <set>
 #include <string>
 
@@ -17,6 +18,9 @@ namespace invalidation {
 class Invalidation;
 class ObjectId;
 
+// Gmock print helper
+void PrintTo(const invalidation::ObjectId& id, std::ostream* os);

[dcheng, 2012/08/18 00:41:29]

I ended up placing this here mostly for convenience, since it was so small. If
you feel strongly about it, I'll move it into a separate header.

+
 }  // namespace invalidation
 
 namespace syncer {