Finish decoupling sync and invalidations

components/invalidation/object_id_invalidation_map.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_OBJECT_ID_INVALIDATION_MAP_H_
 #define COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_H_
 
 #include <map>
 #include <vector>
 
+#include "components/invalidation/invalidation.h"
 #include "components/invalidation/invalidation_export.h"
+#include "components/invalidation/invalidation_util.h"
 #include "components/invalidation/single_object_invalidation_set.h"
-#include "sync/internal_api/public/base/invalidation.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 namespace syncer {
 
 // A set of notifications with some helper methods to organize them by object ID
 // and version number.
 class INVALIDATION_EXPORT ObjectIdInvalidationMap {
   public:
    // Creates an invalidation map that includes an 'unknown version'
    // invalidation for each specified ID in |ids|.
    static ObjectIdInvalidationMap InvalidateAll(const ObjectIdSet& ids);
@@ skipping 42 matching lines @@
                     ObjectIdLessThan> IdToListMap;
 
    ObjectIdInvalidationMap(const IdToListMap& map);
 
    IdToListMap map_;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_H_