Finish decoupling sync and invalidations

components/invalidation/single_object_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_SINGLE_OBJECT_INVALIDATION_SET_H_
 #define COMPONENTS_INVALIDATION_SINGLE_OBJECT_INVALIDATION_SET_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
+#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"
 
 namespace base {
 class ListValue;
 }  // namespace base
 
 namespace syncer {
 
 // Holds a list of invalidations that all share the same Object ID.
 //
 // The list is kept sorted by version to make it easier to perform common
@@ skipping 31 matching lines @@
   scoped_ptr<base::ListValue> ToValue() const;
   bool ResetFromValue(const base::ListValue& list);
 
  private:
   InvalidationsSet invalidations_;
 };
 
 }  // syncer
 
 #endif  // COMPONENTS_INVALIDATION_SINGLE_OBJECT_INVALIDATION_SET_H_