[Invalidations] Add GetInvalidatorState() to Invalidator{,Frontend}

Combine OnNotifications{Enabled,Disabled}() into OnInvalidatorStateChange().  Replace NotificationsDisabledReason with InvalidatorState.

Rename OnIncomingNotification to OnIncomingInvalidation.  Also change
some references of "notification" to "invalidation".

Set the initial invalidator state in ChromeToMobileService.  Also remove OnNotificationsEnabled() call from OnIncomingInvalidation().

Instantiate InvalidatorTest template for ProfileSyncService.

Move comments for invalidation-related functions from ProfileSyncService to InvalidatorFrontend.

Put DISALLOW_COPY_AND_ASSIGN on some classes.

Fix comment in invalidator.h.

BUG=142475
TBR=brettw@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10916131

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155448 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/sync/notifier/non_blocking_invalidator.h b/sync/notifier/non_blocking_invalidator.h
index 8e93219..35e870b 100644
--- a/sync/notifier/non_blocking_invalidator.h
+++ b/sync/notifier/non_blocking_invalidator.h
@@ -50,19 +50,18 @@ class NonBlockingInvalidator
   virtual void UpdateRegisteredIds(InvalidationHandler* handler,
                                    const ObjectIdSet& ids) OVERRIDE;
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
+  virtual InvalidatorState GetInvalidatorState() const 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(const ObjectIdStateMap& id_state_map) OVERRIDE;
+  virtual void SendInvalidation(const ObjectIdStateMap& id_state_map) OVERRIDE;
 
   // InvalidationHandler implementation.
-  virtual void OnNotificationsEnabled() OVERRIDE;
-  virtual void OnNotificationsDisabled(
-      NotificationsDisabledReason reason) OVERRIDE;
-  virtual void OnIncomingNotification(
+  virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE;
+  virtual void OnIncomingInvalidation(
       const ObjectIdStateMap& id_state_map,
-      IncomingNotificationSource source) OVERRIDE;
+      IncomingInvalidationSource source) OVERRIDE;
 
  private:
   class Core;