Move sync/notifier to components/invalidation

components/invalidation/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_
+#ifndef COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
+#define COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
 
 #include <vector>
 
-#include "sync/base/sync_export.h"
+#include "components/invalidation/invalidation_export.h"
 #include "sync/internal_api/public/base/invalidation.h"
+#include "sync/internal_api/public/base/invalidation_util.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 {
+class INVALIDATION_EXPORT UnackedInvalidationSet {
  public:
   static const size_t kMaxBufferedInvalidations;
 
   UnackedInvalidationSet(invalidation::ObjectId id);
   UnackedInvalidationSet(const UnackedInvalidationSet& other);
   ~UnackedInvalidationSet();
 
   // Returns the ObjectID of the invalidations this class is tracking.
   const invalidation::ObjectId& object_id() const;
 
@@ skipping 65 matching lines @@
   invalidation::ObjectId object_id_;
   InvalidationsSet invalidations_;
 };
 
 typedef std::map<invalidation::ObjectId,
                  UnackedInvalidationSet,
                  ObjectIdLessThan> UnackedInvalidationsMap;
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_UNACKED_INVALIDATION_SET_H_
+#endif  // COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_