Implement new invalidations ack tracking system

chrome/browser/policy/cloud/cloud_policy_invalidator.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_INVALIDATOR_H_
 #define CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_INVALIDATOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/policy/cloud/cloud_policy_core.h"
 #include "chrome/browser/policy/cloud/cloud_policy_store.h"
+#include "google/cacheinvalidation/include/types.h"
+#include "sync/internal_api/public/base/invalidation.h"
 #include "sync/notifier/invalidation_handler.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace invalidation {
 class InvalidationService;
 }
 
@@ skipping 131 matching lines @@
   // The version of the latest invalidation received. This is compared to
   // the invalidation version of policy stored to determine when the
   // invalidated policy is up-to-date.
   int64 invalidation_version_;
 
   // The number of invalidations with unknown version received. Since such
   // invalidations do not provide a version number, this count is used to set
   // invalidation_version_ when such invalidations occur.
   int unknown_version_invalidation_count_;
 
-  // The acknowledgment handle for the current invalidation.
-  syncer::AckHandle ack_handle_;
+  // The most up to date invalidation.
+  scoped_ptr<syncer::Invalidation> invalidation_;
 
   // WeakPtrFactory used to create callbacks to this object.
   base::WeakPtrFactory<CloudPolicyInvalidator> weak_factory_;
 
   // The maximum random delay, in ms, between receiving an invalidation and
   // fetching the new policy.
   int max_fetch_delay_;
 
   // The hash value of the current policy. This is used to determine if a new
   // policy is different from the current one.
   uint32 policy_hash_value_;
 
   // A thread checker to make sure that callbacks are invoked on the correct
   // thread.
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyInvalidator);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_INVALIDATOR_H_