Retry: Move some sync/notifier to components/invalidation

components/invalidation/invalidator_registrar.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 SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_
-#define SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_
+#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_REGISTRAR_H_
+#define COMPONENTS_INVALIDATION_INVALIDATOR_REGISTRAR_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
-#include "sync/base/sync_export.h"
+#include "components/invalidation/invalidation_export.h"
 #include "sync/notifier/invalidation_handler.h"
 #include "sync/notifier/invalidation_util.h"
 
 namespace invalidation {
 class ObjectId;
 }  // namespace invalidation
 
 namespace syncer {
 
 class ObjectIdInvalidationMap;
 
 // A helper class for implementations of the Invalidator interface.  It helps
 // keep track of registered handlers and which object ID registrations are
 // associated with which handlers, so implementors can just reuse the logic
 // here to dispatch invalidations and other interesting notifications.
-class SYNC_EXPORT InvalidatorRegistrar {
+class INVALIDATION_EXPORT InvalidatorRegistrar {
  public:
   InvalidatorRegistrar();
 
   // It is an error to have registered handlers on destruction.
   ~InvalidatorRegistrar();
 
   // Starts sending notifications to |handler|.  |handler| must not be NULL,
   // and it must already be registered.
   void RegisterHandler(InvalidationHandler* handler);
 
@@ skipping 47 matching lines @@
   base::ThreadChecker thread_checker_;
   ObserverList<InvalidationHandler> handlers_;
   HandlerIdsMap handler_to_ids_map_;
   InvalidatorState state_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidatorRegistrar);
 };
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_
+#endif  // COMPONENTS_INVALIDATION_INVALIDATOR_REGISTRAR_H_