Rename SyncNotifier->Invalidator and SyncNotifierObserver->InvalidationHandler.

sync/notifier/fake_invalidator.h

Index: sync/notifier/fake_invalidator.h
diff --git a/sync/notifier/fake_sync_notifier.h b/sync/notifier/fake_invalidator.h
similarity index 60%
rename from sync/notifier/fake_sync_notifier.h
rename to sync/notifier/fake_invalidator.h
index 74cfdf115062c27856e51209b0c2041d9f47672e..26c5ad857eb836d7771a552c9d64f037e3caaf22 100644
--- a/sync/notifier/fake_sync_notifier.h
+++ b/sync/notifier/fake_invalidator.h
@@ -2,35 +2,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_NOTIFIER_FAKE_SYNC_NOTIFIER_H_
-#define SYNC_NOTIFIER_FAKE_SYNC_NOTIFIER_H_
+#ifndef SYNC_NOTIFIER_FAKE_INVALIDATOR_H_
+#define SYNC_NOTIFIER_FAKE_INVALIDATOR_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "sync/notifier/invalidation_util.h"
-#include "sync/notifier/sync_notifier.h"
-#include "sync/notifier/sync_notifier_registrar.h"
+#include "sync/notifier/invalidator.h"
+#include "sync/notifier/invalidator_registrar.h"
 
 namespace syncer {
 
-class FakeSyncNotifier : public SyncNotifier {
+class FakeInvalidator : public Invalidator {
  public:
-  FakeSyncNotifier();
-  virtual ~FakeSyncNotifier();
+  FakeInvalidator();
+  virtual ~FakeInvalidator();
 
-  bool IsHandlerRegistered(SyncNotifierObserver* handler) const;
-  ObjectIdSet GetRegisteredIds(SyncNotifierObserver* handler) const;
+  bool IsHandlerRegistered(InvalidationHandler* handler) const;
+  ObjectIdSet GetRegisteredIds(InvalidationHandler* handler) const;
   const std::string& GetUniqueId() const;
   const std::string& GetStateDeprecated() const;
   const std::string& GetCredentialsEmail() const;
   const std::string& GetCredentialsToken() const;
   ModelTypeSet GetLastChangedTypes() const;
 
-  virtual void RegisterHandler(SyncNotifierObserver* handler) OVERRIDE;
-  virtual void UpdateRegisteredIds(SyncNotifierObserver* handler,
+  virtual void RegisterHandler(InvalidationHandler* handler) OVERRIDE;
+  virtual void UpdateRegisteredIds(InvalidationHandler* handler,
                                    const ObjectIdSet& ids) OVERRIDE;
-  virtual void UnregisterHandler(SyncNotifierObserver* handler) OVERRIDE;
+  virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
   virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
@@ -38,7 +38,7 @@ class FakeSyncNotifier : public SyncNotifier {
   virtual void SendNotification(ModelTypeSet changed_types) OVERRIDE;
 
  private:
-  SyncNotifierRegistrar registrar_;
+  InvalidatorRegistrar registrar_;
   std::string unique_id_;
   std::string state_;
   std::string email_;
@@ -48,4 +48,4 @@ class FakeSyncNotifier : public SyncNotifier {
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_FAKE_SYNC_NOTIFIER_H_
+#endif  // SYNC_NOTIFIER_FAKE_INVALIDATOR_H_