Rename SyncNotifier->Invalidator and SyncNotifierObserver->InvalidationHandler.

sync/notifier/non_blocking_invalidation_notifier.h

Index: sync/notifier/non_blocking_invalidation_notifier.h
diff --git a/sync/notifier/non_blocking_invalidation_notifier.h b/sync/notifier/non_blocking_invalidation_notifier.h
index 849c981371451978b5bdb999bb41d16a9ee6362d..23386d72622299a5da995859c7d121ea4011d0f1 100644
--- a/sync/notifier/non_blocking_invalidation_notifier.h
+++ b/sync/notifier/non_blocking_invalidation_notifier.h
@@ -16,10 +16,10 @@
 #include "base/memory/weak_ptr.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "sync/internal_api/public/util/weak_handle.h"
+#include "sync/notifier/invalidation_handler.h"
 #include "sync/notifier/invalidation_state_tracker.h"
-#include "sync/notifier/sync_notifier.h"
-#include "sync/notifier/sync_notifier_observer.h"
-#include "sync/notifier/sync_notifier_registrar.h"
+#include "sync/notifier/invalidator.h"
+#include "sync/notifier/invalidator_registrar.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -30,9 +30,9 @@ namespace syncer {
 // TODO(akalin): Generalize to NonBlockingSyncNotifier

[akalin, 2012/08/27 22:38:31]

Generalize to NonBlockingInvalidator

[dcheng, 2012/08/28 00:20:22]

Done.

 // (http://crbug.com/140409).
 class NonBlockingInvalidationNotifier
-    : public SyncNotifier,
-      // SyncNotifierObserver to "observe" our Core via WeakHandle.
-      public SyncNotifierObserver {
+    : public Invalidator,
+      // InvalidationHandler to "observe" our Core via WeakHandle.
+      public InvalidationHandler {
  public:
   // |invalidation_state_tracker| must be initialized.
   NonBlockingInvalidationNotifier(
@@ -45,18 +45,18 @@ class NonBlockingInvalidationNotifier
 
   virtual ~NonBlockingInvalidationNotifier();
 
-  // SyncNotifier implementation.
-  virtual void RegisterHandler(SyncNotifierObserver* handler) OVERRIDE;
-  virtual void UpdateRegisteredIds(SyncNotifierObserver* handler,
+  // Invalidator implementation.
+  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(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void SendNotification(ModelTypeSet changed_types) OVERRIDE;
 
-  // SyncNotifierObserver implementation.
+  // InvalidationHandler implementation.
   virtual void OnNotificationsEnabled() OVERRIDE;
   virtual void OnNotificationsDisabled(
       NotificationsDisabledReason reason) OVERRIDE;
@@ -69,7 +69,7 @@ class NonBlockingInvalidationNotifier
 
   base::WeakPtrFactory<NonBlockingInvalidationNotifier> weak_ptr_factory_;
 
-  SyncNotifierRegistrar registrar_;
+  InvalidatorRegistrar registrar_;
 
   // The real guts of NonBlockingInvalidationNotifier, which allows
   // this class to live completely on the parent thread.