[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, 7 insertions, 12 deletions

diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index 24789fd7..5a832c2 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -54,25 +54,20 @@ class NotificationPrinter : public InvalidationHandler {
   NotificationPrinter() {}
   virtual ~NotificationPrinter() {}
 
-  virtual void OnNotificationsEnabled() OVERRIDE {
-    LOG(INFO) << "Notifications enabled";
+  virtual void OnInvalidatorStateChange(InvalidatorState state) OVERRIDE {
+    LOG(INFO) << "Invalidator state changed to "
+              << InvalidatorStateToString(state);
   }
 
-  virtual void OnNotificationsDisabled(
-      NotificationsDisabledReason reason) OVERRIDE {
-    LOG(INFO) << "Notifications disabled with reason "
-              << NotificationsDisabledReasonToString(reason);
-  }
-
-  virtual void OnIncomingNotification(
+  virtual void OnIncomingInvalidation(
       const ObjectIdStateMap& id_state_map,
-      IncomingNotificationSource source) OVERRIDE {
+      IncomingInvalidationSource source) OVERRIDE {
     const ModelTypeStateMap& type_state_map =
         ObjectIdStateMapToModelTypeStateMap(id_state_map);
     for (ModelTypeStateMap::const_iterator it = type_state_map.begin();
          it != type_state_map.end(); ++it) {
-      LOG(INFO) << (source == REMOTE_NOTIFICATION ? "Remote" : "Local")
-                << " Notification: type = "
+      LOG(INFO) << (source == REMOTE_INVALIDATION ? "Remote" : "Local")
+                << " Invalidation: type = "
                 << ModelTypeToString(it->first)
                 << ", payload = " << it->second.payload;
     }