Finish decoupling sync and invalidations

components/invalidation/unacked_invalidation_set.h

 // Copyright 2014 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 COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
 #define COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_
 
-#include <vector>
+#include <set>
 
+#include "components/invalidation/invalidation.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 "components/invalidation/invalidation_util.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 
 namespace base {
 class DictionaryValue;
 }  // namespace base
 
 namespace syncer {
 
 namespace test_util {
 class UnackedInvalidationSetEqMatcher;
@@ skipping 86 matching lines @@
   InvalidationsSet invalidations_;
 };
 
 typedef std::map<invalidation::ObjectId,
                  UnackedInvalidationSet,
                  ObjectIdLessThan> UnackedInvalidationsMap;
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_