Finish decoupling sync and invalidations

components/invalidation/mock_ack_handler.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_MOCK_ACK_HANDLER_H_
 #define COMPONENTS_INVALIDATION_MOCK_ACK_HANDLER_H_
 
 #include <map>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
+#include "components/invalidation/ack_handler.h"
 #include "components/invalidation/invalidation_export.h"
-#include "sync/internal_api/public/base/ack_handler.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 syncer {
 
 class Invalidation;
 
 // This AckHandler implementation colaborates with the FakeInvalidationService
 // to enable unit tests to assert that invalidations are being acked properly.
 class INVALIDATION_EXPORT MockAckHandler
   : public AckHandler,
@@ skipping 48 matching lines @@
   InvalidationVector unacked_invalidations_;
   InvalidationVector acked_invalidations_;
   InvalidationVector dropped_invalidations_;
 
   IdHandleMap unrecovered_drop_events_;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_MOCK_ACK_HANDLER_H_