Implement new invalidations ack tracking system

sync/notifier/unacked_invalidation_set.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 SYNC_NOTIFIER_UNACKED_INVALIDATION_SET_H_
 #define SYNC_NOTIFIER_UNACKED_INVALIDATION_SET_H_
 
 #include <vector>
 
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/base/invalidation.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/invalidation_util.h"
 
 namespace base {
 class DictionaryValue;
 }  // namespace base
 
 namespace syncer {
 
+namespace test_util {
+class UnackedInvalidationSetEqMatcher;
+}  // test_util
+
 class SingleObjectInvalidationSet;
 class ObjectIdInvalidationMap;
 class AckHandle;
 
 // Manages the set of invalidations that are awaiting local acknowledgement for
 // a particular ObjectId.  This set of invalidations will be persisted across
 // restarts, though this class is not directly responsible for that.
 class SYNC_EXPORT UnackedInvalidationSet {
  public:
   static const size_t kMaxBufferedInvalidations;
@@ skipping 50 matching lines @@
   // Given an AckHandle belonging to one of the contained invalidations, finds
   // the invalidation, drops it from the list, and adds additional state to
   // indicate that this invalidation has been lost without being acted on.
   void Drop(const AckHandle& handle);
 
   scoped_ptr<base::DictionaryValue> ToValue() const;
   bool ResetFromValue(const base::DictionaryValue& value);
 
  private:
   // Allow this test helper to have access to our internals.
-  friend class UnackedInvalidationSetEqMatcher;
+  friend class test_util::UnackedInvalidationSetEqMatcher;
 
   typedef std::set<Invalidation, InvalidationVersionLessThan> InvalidationsSet;
 
   bool ResetListFromValue(const base::ListValue& value);
 
   // Limits the list size to the given maximum.  This function will correctly
   // update this class' internal data to indicate if invalidations have been
   // dropped.
   void Truncate(size_t max_size);
 
   bool registered_;
   invalidation::ObjectId object_id_;
   InvalidationsSet invalidations_;
 };
 
 typedef std::map<invalidation::ObjectId,
                  UnackedInvalidationSet,
                  ObjectIdLessThan> UnackedInvalidationsMap;
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_UNACKED_INVALIDATION_SET_H_