Invalidation trickles mega-patch

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 670f61209ea1cae00fbf011b3a398fd001c408c3..49bbd34fe3c71b52bca406e2c27614cc89ec7371 100644
--- a/sync/notifier/invalidation_util.h
+++ b/sync/notifier/invalidation_util.h
@@ -12,7 +12,9 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
+#include "google/cacheinvalidation/include/types.h"
 #include "sync/base/sync_export.h"
+#include "sync/internal_api/public/base/invalidation.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 namespace base {
@@ -22,7 +24,6 @@ class DictionaryValue;
 namespace invalidation {
 
 class Invalidation;
-class ObjectId;
 
 // Gmock print helper
 SYNC_EXPORT_PRIVATE void PrintTo(const invalidation::ObjectId& id,
@@ -37,6 +38,11 @@ struct SYNC_EXPORT ObjectIdLessThan {
                   const invalidation::ObjectId& rhs) const;
 };
 
+struct InvalidationVersionLessThan {
+  bool operator()(const syncer::Invalidation& a,
+                  const syncer::Invalidation& b) const;
+};
+
 typedef std::set<invalidation::ObjectId, ObjectIdLessThan> ObjectIdSet;
 
 SYNC_EXPORT bool RealModelTypeToObjectId(ModelType model_type,