Finish decoupling sync and invalidations

components/invalidation/p2p_invalidator.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.
 //
 // An invalidator that uses p2p invalidations based on XMPP push
 // notifications.  Used only for sync integration tests.
 
 #ifndef COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_
 #define COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "components/invalidation/invalidation_export.h"
 #include "components/invalidation/invalidator.h"
 #include "components/invalidation/invalidator_registrar.h"
+#include "components/invalidation/invalidator_state.h"
 #include "components/invalidation/object_id_invalidation_map.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "jingle/notifier/listener/push_client_observer.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
-#include "sync/internal_api/public/base/model_type.h"
 
 namespace notifier {
 class PushClient;
 }  // namespace notifier
 
 namespace syncer {
 
 // The channel to use for sync notifications.
 INVALIDATION_EXPORT extern const char kSyncP2PNotificationChannel[];
 
@@ skipping 103 matching lines @@
   bool notifications_enabled_;
   // Which set of clients should be sent notifications.
   P2PNotificationTarget send_notification_target_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PInvalidator);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_