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

sync/notifier/chrome_invalidation_client_unittest.cc

Index: sync/notifier/chrome_invalidation_client_unittest.cc
diff --git a/sync/notifier/chrome_invalidation_client_unittest.cc b/sync/notifier/chrome_invalidation_client_unittest.cc
index a7c8f8afd8f296f2b129032f1ddf47c8142a0c34..51eefcc8c20818d4f6037cc35757b6d5124ed37f 100644
--- a/sync/notifier/chrome_invalidation_client_unittest.cc
+++ b/sync/notifier/chrome_invalidation_client_unittest.cc
@@ -131,7 +131,7 @@ class FakeInvalidationClient : public invalidation::InvalidationClient {
 // and state.
 class FakeListener : public ChromeInvalidationClient::Listener {
  public:
-  FakeListener() : reason_(TRANSIENT_NOTIFICATION_ERROR) {}
+  FakeListener() : state_(TRANSIENT_INVALIDATION_ERROR) {}
   virtual ~FakeListener() {}
 
   int GetInvalidationCount(const ObjectId& id) const {
@@ -144,9 +144,8 @@ class FakeListener : public ChromeInvalidationClient::Listener {
     return (it == states_.end()) ? "" : it->second.payload;
   }
 
-  // NO_NOTIFICATION_ERROR is the enabled state.
-  NotificationsDisabledReason GetNotificationsDisabledReason() const {
-    return reason_;
+  InvalidatorState GetInvalidatorState() const {
+    return state_;
   }
 
   // ChromeInvalidationClient::Listener implementation.
@@ -159,19 +158,15 @@ class FakeListener : public ChromeInvalidationClient::Listener {
     }
   }
 
-  virtual void OnNotificationsEnabled() {
-    reason_ = NO_NOTIFICATION_ERROR;
-  }
-
-  virtual void OnNotificationsDisabled(NotificationsDisabledReason reason) {
-    reason_ = reason;
+  virtual void OnInvalidatorStateChange(InvalidatorState state) {
+    state_ = state;
   }
 
  private:
   typedef std::map<ObjectId, int, ObjectIdLessThan> ObjectIdCountMap;
   ObjectIdCountMap invalidation_counts_;
   ObjectIdStateMap states_;
-  NotificationsDisabledReason reason_;
+  InvalidatorState state_;
 };
 
 invalidation::InvalidationClient* CreateFakeInvalidationClient(
@@ -222,8 +217,8 @@ class ChromeInvalidationClientTest : public testing::Test {
     return fake_listener_.GetPayload(id);
   }
 
-  NotificationsDisabledReason GetNotificationsDisabledReason() const {
-    return fake_listener_.GetNotificationsDisabledReason();
+  InvalidatorState GetInvalidatorState() const {
+    return fake_listener_.GetInvalidatorState();
   }
 
   int64 GetMaxVersion(const ObjectId& id) const {
@@ -647,53 +642,49 @@ TEST_F(ChromeInvalidationClientTest, RegisterTypesPreserved) {
 // Without readying the client, disable notifications, then enable
 // them.  The listener should still think notifications are disabled.
 TEST_F(ChromeInvalidationClientTest, EnableNotificationsNotReady) {
-  EXPECT_EQ(TRANSIENT_NOTIFICATION_ERROR,
-            GetNotificationsDisabledReason());
+  EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR,
+            GetInvalidatorState());
 
   DisableNotifications(
       notifier::TRANSIENT_NOTIFICATION_ERROR);
 
-  EXPECT_EQ(TRANSIENT_NOTIFICATION_ERROR,
-            GetNotificationsDisabledReason());
+  EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, GetInvalidatorState());
 
-  DisableNotifications(
-      notifier::NOTIFICATION_CREDENTIALS_REJECTED);
+  DisableNotifications(notifier::NOTIFICATION_CREDENTIALS_REJECTED);
 
-  EXPECT_EQ(NOTIFICATION_CREDENTIALS_REJECTED,
-            GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATION_CREDENTIALS_REJECTED, GetInvalidatorState());
 
   EnableNotifications();
 
-  EXPECT_EQ(TRANSIENT_NOTIFICATION_ERROR,
-            GetNotificationsDisabledReason());
+  EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, GetInvalidatorState());
 }
 
 // Enable notifications then Ready the invalidation client.  The
 // listener should then be ready.
 TEST_F(ChromeInvalidationClientTest, EnableNotificationsThenReady) {
-  EXPECT_EQ(TRANSIENT_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, GetInvalidatorState());
 
   EnableNotifications();
 
-  EXPECT_EQ(TRANSIENT_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, GetInvalidatorState());
 
   client_.Ready(fake_invalidation_client_);
 
-  EXPECT_EQ(NO_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATIONS_ENABLED, GetInvalidatorState());
 }
 
 // Ready the invalidation client then enable notifications.  The
 // listener should then be ready.
 TEST_F(ChromeInvalidationClientTest, ReadyThenEnableNotifications) {
-  EXPECT_EQ(TRANSIENT_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, GetInvalidatorState());
 
   client_.Ready(fake_invalidation_client_);
 
-  EXPECT_EQ(TRANSIENT_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, GetInvalidatorState());
 
   EnableNotifications();
 
-  EXPECT_EQ(NO_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATIONS_ENABLED, GetInvalidatorState());
 }
 
 // Enable notifications and ready the client.  Then disable
@@ -703,17 +694,16 @@ TEST_F(ChromeInvalidationClientTest, PushClientAuthError) {
   EnableNotifications();
   client_.Ready(fake_invalidation_client_);
 
-  EXPECT_EQ(NO_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATIONS_ENABLED, GetInvalidatorState());
 
   DisableNotifications(
       notifier::NOTIFICATION_CREDENTIALS_REJECTED);
 
-  EXPECT_EQ(NOTIFICATION_CREDENTIALS_REJECTED,
-            GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATION_CREDENTIALS_REJECTED, GetInvalidatorState());
 
   EnableNotifications();
 
-  EXPECT_EQ(NO_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATIONS_ENABLED, GetInvalidatorState());
 }
 
 // Enable notifications and ready the client.  Then simulate an auth
@@ -724,7 +714,7 @@ TEST_F(ChromeInvalidationClientTest, InvalidationClientAuthError) {
   EnableNotifications();
   client_.Ready(fake_invalidation_client_);
 
-  EXPECT_EQ(NO_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATIONS_ENABLED, GetInvalidatorState());
 
   client_.InformError(
       fake_invalidation_client_,
@@ -734,29 +724,23 @@ TEST_F(ChromeInvalidationClientTest, InvalidationClientAuthError) {
           "auth error",
           invalidation::ErrorContext()));
 
-  EXPECT_EQ(NOTIFICATION_CREDENTIALS_REJECTED,
-            GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATION_CREDENTIALS_REJECTED, GetInvalidatorState());
 
-  DisableNotifications(
-      notifier::TRANSIENT_NOTIFICATION_ERROR);
+  DisableNotifications(notifier::TRANSIENT_NOTIFICATION_ERROR);
 
-  EXPECT_EQ(NOTIFICATION_CREDENTIALS_REJECTED,
-            GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATION_CREDENTIALS_REJECTED, GetInvalidatorState());
 
-  DisableNotifications(
-      notifier::TRANSIENT_NOTIFICATION_ERROR);
+  DisableNotifications(notifier::TRANSIENT_NOTIFICATION_ERROR);
 
-  EXPECT_EQ(NOTIFICATION_CREDENTIALS_REJECTED,
-            GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATION_CREDENTIALS_REJECTED, GetInvalidatorState());
 
   EnableNotifications();
 
-  EXPECT_EQ(NOTIFICATION_CREDENTIALS_REJECTED,
-            GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATION_CREDENTIALS_REJECTED, GetInvalidatorState());
 
   client_.Ready(fake_invalidation_client_);
 
-  EXPECT_EQ(NO_NOTIFICATION_ERROR, GetNotificationsDisabledReason());
+  EXPECT_EQ(INVALIDATIONS_ENABLED, GetInvalidatorState());
 }
 
 }  // namespace