Add code for new invalidation local ack system

sync/internal_api/public/base/invalidation.cc

 // Copyright 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/internal_api/public/base/invalidation.h"
 
 #include <cstddef>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
+#include "sync/notifier/ack_handler.h"
+#include "sync/notifier/dropped_invalidation_tracker.h"
 #include "sync/notifier/invalidation_util.h"
 
 namespace syncer {
 
 namespace {
 const char kObjectIdKey[] = "objectId";
 const char kIsUnknownVersionKey[] = "isUnknownVersion";
 const char kVersionKey[] = "version";
 const char kPayloadKey[] = "payload";
 const int64 kInvalidVersion = -1;
@@ skipping 91 matching lines @@
 }
 
 void Invalidation::set_ack_handler(syncer::WeakHandle<AckHandler> handler) {
   ack_handler_ = handler;
 }
 
 bool Invalidation::SupportsAcknowledgement() const {
   return ack_handler_.IsInitialized();
 }
 
-// void Invalidation::Acknowledge() const {
-//   if (SupportsAcknowledgement()) {
-//     ack_handler_.Call(FROM_HERE,
-//                       &AckHandler::Acknowledge,
-//                       id_,
-//                       ack_handle_);
-//   }
-// }
+void Invalidation::Acknowledge() const {
+  if (SupportsAcknowledgement()) {
+    ack_handler_.Call(FROM_HERE,
+                      &AckHandler::Acknowledge,
+                      id_,
+                      ack_handle_);
+  }
+}
 
-// void Invalidation::Drop(DroppedInvalidationTracker* tracker) const {
-//   DCHECK(tracker->object_id() == object_id());
-//   tracker->Drop(ack_handler_, ack_handle_);
-// }
+void Invalidation::Drop(DroppedInvalidationTracker* tracker) const {
+  DCHECK(tracker->object_id() == object_id());
+  tracker->RecordDropEvent(ack_handler_, ack_handle_);
+  ack_handler_.Call(FROM_HERE,
+                    &AckHandler::Drop,
+                    id_,
+                    ack_handle_);
+}
 
 bool Invalidation::Equals(const Invalidation& other) const {
   return id_ == other.id_
       && is_unknown_version_ == other.is_unknown_version_
       && version_ == other.version_
       && payload_ == other.payload_;
 }
 
 scoped_ptr<base::DictionaryValue> Invalidation::ToValue() const {
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
@@ skipping 22 matching lines @@
     int64 version,
     const std::string& payload,
     AckHandle ack_handle)
   : id_(id),
     is_unknown_version_(is_unknown_version),
     version_(version),
     payload_(payload),
     ack_handle_(ack_handle) {}
 
 }  // namespace syncer