Finish decoupling sync and invalidations

components/invalidation/registration_manager.cc

 // 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.
 
 #include "components/invalidation/registration_manager.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <iterator>
 #include <string>
 #include <utility>
 
 #include "base/rand_util.h"
 #include "base/stl_util.h"
+#include "components/invalidation/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
 #include "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
 
 namespace syncer {
 
 RegistrationManager::PendingRegistrationInfo::PendingRegistrationInfo() {}
 
 RegistrationManager::RegistrationStatus::RegistrationStatus(
     const invalidation::ObjectId& id, RegistrationManager* manager)
     : id(id),
       registration_manager(manager),
       enabled(true),
@@ skipping 268 matching lines @@
 bool RegistrationManager::IsIdRegistered(
     const invalidation::ObjectId& id) const {
   DCHECK(CalledOnValidThread());
   RegistrationStatusMap::const_iterator it =
       registration_statuses_.find(id);
   return it != registration_statuses_.end() &&
       it->second->state == invalidation::InvalidationListener::REGISTERED;
 }
 
 }  // namespace syncer