[Sync] Rework Invalidator-related unit tests

sync/internal_api/public/base/invalidation_state.h

Index: sync/internal_api/public/base/invalidation_state.h
diff --git a/sync/internal_api/public/base/invalidation_state.h b/sync/internal_api/public/base/invalidation_state.h
index 8b790197a88d68f449adcd6bffa8ad3bc8ffe20f..8c811afda6684e8ccea314011ce5cb5fb7f46898 100644
--- a/sync/internal_api/public/base/invalidation_state.h
+++ b/sync/internal_api/public/base/invalidation_state.h
@@ -7,17 +7,37 @@
 
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
+
+namespace base {
+class DictionaryValue;
+class Value;
+}  // namespace
+
 namespace syncer {
 
 // Opaque class that represents an ack handle.
 // TODO(dcheng): This is just a refactoring change, so the class is empty for
 // the moment. It will be filled once we start implementing 'reminders'.
 class AckHandle {
+ public:
+  bool Equals(const AckHandle& other) const;
+
+  scoped_ptr<base::Value> ToValue() const;
+
+  bool ResetFromValue(const base::Value& value);
 };
 
 struct InvalidationState {
   std::string payload;
   AckHandle ack_handle;
+
+  bool Equals(const InvalidationState& other) const;
+
+  // Caller owns the returned DictionaryValue.
+  scoped_ptr<base::DictionaryValue> ToValue() const;
+
+  bool ResetFromValue(const base::DictionaryValue& value);
 };
 
 }  // namespace syncer