Revert of Move some sync/notifier to components/invalidation

chrome/browser/invalidation/invalidation_service_android.h

 // Copyright (c) 2013 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 CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
 #define CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/invalidation/invalidation_logger.h"
 #include "components/invalidation/invalidation_service.h"
-#include "components/invalidation/invalidator_registrar.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "sync/notifier/invalidator_registrar.h"
 
 class Profile;
 
 namespace invalidation {
 class InvalidationControllerAndroid;
 class InvalidationLogger;
 
 // This InvalidationService is used to deliver invalidations on Android.  The
 // Android operating system has its own mechanisms for delivering invalidations.
 // This class uses the NotificationService to communicate with a thin wrapper
@@ skipping 47 matching lines @@
   // The invalidation logger object we use to record state changes
   // and invalidations.
   InvalidationLogger logger_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidationServiceAndroid);
 };
 
 }  // namespace invalidation
 
 #endif  // CHROME_BROWSER_INVALIDATION_INVALIDATION_SERVICE_ANDROID_H_