Invalidation trickles mega-patch

sync/notifier/invalidation_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/notifier/invalidation_util.h"
 
 #include <ostream>
 #include <sstream>
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 
 namespace invalidation {
 void PrintTo(const invalidation::ObjectId& id, std::ostream* os) {
   *os << syncer::ObjectIdToString(id);
 }
 }  // namespace invalidation
 
 namespace syncer {
 
 bool ObjectIdLessThan::operator()(const invalidation::ObjectId& lhs,
                                   const invalidation::ObjectId& rhs) const {
   return (lhs.source() < rhs.source()) ||
          (lhs.source() == rhs.source() && lhs.name() < rhs.name());
 }
 
+bool InvalidationVersionLessThan::operator()(
+    const syncer::Invalidation& a,
+    const syncer::Invalidation& b) const {
+  DCHECK(a.GetObjectId() == b.GetObjectId())
+      << "a: " << ObjectIdToString(a.GetObjectId()) << ", "
+      << "b: " << ObjectIdToString(a.GetObjectId());
+
+  if (a.IsUnknownVersion() && !b.IsUnknownVersion())
+    return true;
+
+  if (!a.IsUnknownVersion() && b.IsUnknownVersion())
+    return false;
+
+  if (a.IsUnknownVersion() && b.IsUnknownVersion())
+    return false;
+
+  return a.GetVersion() < b.GetVersion();
+}
+
 bool RealModelTypeToObjectId(ModelType model_type,
                              invalidation::ObjectId* object_id) {
   std::string notification_type;
   if (!RealModelTypeToNotificationType(model_type, &notification_type)) {
     return false;
   }
   object_id->Init(ipc::invalidation::ObjectSource::CHROME_SYNC,
                   notification_type);
   return true;
 }
@@ skipping 62 matching lines @@
     const invalidation::Invalidation& invalidation) {
   std::stringstream ss;
   ss << "{ ";
   ss << "object_id: " << ObjectIdToString(invalidation.object_id()) << ", ";
   ss << "version: " << invalidation.version();
   ss << " }";
   return ss.str();
 }
 
 }  // namespace syncer