[Sync] Rework Invalidator-related unit tests

sync/notifier/object_id_state_map.h

Index: sync/notifier/object_id_state_map.h
diff --git a/sync/notifier/object_id_state_map.h b/sync/notifier/object_id_state_map.h
index 17f8cebe686fc31b35e9cc35b7075b479c38ffba..1e9513e6e620146b867f73697135641389242d63 100644
--- a/sync/notifier/object_id_state_map.h
+++ b/sync/notifier/object_id_state_map.h
@@ -8,11 +8,16 @@
 #include <map>
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "sync/internal_api/public/base/invalidation_state.h"
 #include "sync/internal_api/public/base/model_type_state_map.h"
 #include "sync/notifier/invalidation_util.h"
 
+namespace base {
+class ListValue;
+}  // namespace base
+
 namespace syncer {
 
 typedef std::map<invalidation::ObjectId,
@@ -24,6 +29,15 @@ ObjectIdSet ObjectIdStateMapToSet(const ObjectIdStateMap& id_payloads);
 ObjectIdStateMap ObjectIdSetToStateMap(const ObjectIdSet& ids,
                                        const std::string& payload);
 
+bool ObjectIdStateMapEquals(const ObjectIdStateMap& id_state_map1,
+                            const ObjectIdStateMap& id_state_map2);
+
+scoped_ptr<base::ListValue> ObjectIdStateMapToValue(
+    const ObjectIdStateMap& model_type_payloads);
+
+bool ObjectIdStateMapFromValue(const base::ListValue& value,
+                               ObjectIdStateMap* out);
+
 // Converts between ObjectIdStateMaps and ModelTypeStateMaps.
 ModelTypeStateMap ObjectIdStateMapToModelTypeStateMap(
     const ObjectIdStateMap& id_payloads);