sync: Inject sync/'s dependency on invalidations

sync/internal_api/public/base/invalidation.cc

Index: sync/internal_api/public/base/invalidation.cc
diff --git a/sync/internal_api/public/base/invalidation.cc b/sync/internal_api/public/base/invalidation.cc
index ff7a5a78fd4dc542856a768b08565552e1823150..e6a64be8616c245309ea6138424cb65be7ac242f 100644
--- a/sync/internal_api/public/base/invalidation.cc
+++ b/sync/internal_api/public/base/invalidation.cc
@@ -11,7 +11,6 @@
 #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 {
@@ -43,6 +42,15 @@ Invalidation Invalidation::InitFromDroppedInvalidation(
                       std::string(), dropped.ack_handle_);
 }
 
+Invalidation::Invalidation(const Invalidation& other)
+  : id_(other.id_),
+    is_unknown_version_(other.is_unknown_version_),
+    version_(other.version_),
+    payload_(other.payload_),
+    ack_handle_(other.ack_handle_),
+    ack_handler_(other.ack_handler_) {
+}
+
 scoped_ptr<Invalidation> Invalidation::InitFromValue(
     const base::DictionaryValue& value) {
   invalidation::ObjectId id;
@@ -128,9 +136,7 @@ void Invalidation::Acknowledge() const {
   }
 }
 
-void Invalidation::Drop(DroppedInvalidationTracker* tracker) const {
-  DCHECK(tracker->object_id() == object_id());
-  tracker->RecordDropEvent(ack_handler_, ack_handle_);
+void Invalidation::Drop() {
   if (SupportsAcknowledgement()) {
     ack_handler_.Call(FROM_HERE,
                       &AckHandler::Drop,