#include "components/gcm_driver/gcm_driver.h"
#include "components/invalidation/gcm_invalidation_bridge.h"
#include "components/invalidation/invalidation_service_util.h"
+#include "components/invalidation/invalidation_util.h"
+#include "components/invalidation/invalidator.h"
+#include "components/invalidation/invalidator_state.h"
#include "components/invalidation/non_blocking_invalidator.h"
+#include "components/invalidation/object_id_invalidation_map.h"
#include "google_apis/gaia/gaia_constants.h"
#include "net/url_request/url_request_context_getter.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
-#include "sync/notifier/invalidation_util.h"
-#include "sync/notifier/invalidator.h"
-#include "sync/notifier/object_id_invalidation_map.h"
static const char* kOAuth2Scopes[] = {
GaiaConstants::kGoogleTalkOAuth2Scope