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

sync/notifier/chrome_invalidation_client_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cstddef>
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ skipping 113 matching lines @@
  private:
   bool started_;
   ObjectIdSet registered_ids_;
   AckHandleSet acked_handles_;
 };
 
 // Fake listener tkat keeps track of invalidation counts, payloads,
 // 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 {
     ObjectIdCountMap::const_iterator it = invalidation_counts_.find(id);
     return (it == invalidation_counts_.end()) ? 0 : it->second;
   }
 
   std::string GetPayload(const ObjectId& id) const {
     ObjectIdStateMap::const_iterator it = states_.find(id);
     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.
 
   virtual void OnInvalidate(const ObjectIdStateMap& id_state_map) OVERRIDE {
     for (ObjectIdStateMap::const_iterator it = id_state_map.begin();
          it != id_state_map.end(); ++it) {
       ++invalidation_counts_[it->first];
       states_[it->first] = it->second;
     }
   }
 
-  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(
     FakeInvalidationClient** fake_invalidation_client,
     invalidation::SystemResources* resources,
     int client_type,
     const invalidation::string& client_name,
     const invalidation::string& application_name,
     invalidation::InvalidationListener* listener) {
   *fake_invalidation_client = new FakeInvalidationClient();
@@ skipping 30 matching lines @@
   }
 
   int GetInvalidationCount(const ObjectId& id) const {
     return fake_listener_.GetInvalidationCount(id);
   }
 
   std::string GetPayload(const ObjectId& id) const {
     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 {
     return fake_tracker_.GetMaxVersion(id);
   }
 
   std::string GetInvalidationState() const {
     return fake_tracker_.GetInvalidationState();
   }
 
@@ skipping 403 matching lines @@
   EXPECT_TRUE(GetRegisteredIds().empty());
 
   client_.Ready(fake_invalidation_client_);
 
   EXPECT_EQ(registered_ids_, GetRegisteredIds());
 }
 
 // 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
 // notifications with an auth error and re-enable notifications.  The
 // listener should go into an auth error mode and then back out.
 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
 // error from the invalidation client.  Simulate some notification
 // events, then re-ready the client.  The listener should go into an
 // auth error mode and come out of it only after the client is ready.
 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_,
       invalidation::ErrorInfo(
           invalidation::ErrorReason::AUTH_FAILURE,
           false /* is_transient */,
           "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
 
 }  // namespace syncer