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

sync/notifier/p2p_invalidator.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 "sync/notifier/p2p_invalidator.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 43 matching lines @@
   if (target_str == kNotifyOthers) {
     return NOTIFY_OTHERS;
   }
   if (target_str == kNotifyAll) {
     return NOTIFY_ALL;
   }
   LOG(WARNING) << "Could not parse " << target_str;
   return NOTIFY_SELF;
 }
 
-IncomingNotificationSource P2PNotificationSourceFromInteger(int source_num) {
-  if (source_num == LOCAL_NOTIFICATION) {
-    return LOCAL_NOTIFICATION;
+IncomingInvalidationSource P2PNotificationSourceFromInteger(int source_num) {
+  if (source_num == LOCAL_INVALIDATION) {
+    return LOCAL_INVALIDATION;
   }
-  return REMOTE_NOTIFICATION;
+  return REMOTE_INVALIDATION;
 }
 
 P2PNotificationData::P2PNotificationData()
-    : target_(NOTIFY_SELF), source_(REMOTE_NOTIFICATION) {}
+    : target_(NOTIFY_SELF), source_(REMOTE_INVALIDATION) {}
 
 P2PNotificationData::P2PNotificationData(
     const std::string& sender_id,
     P2PNotificationTarget target,
     const ObjectIdStateMap& id_state_map,
-    IncomingNotificationSource source)
+    IncomingInvalidationSource source)
     : sender_id_(sender_id),
       target_(target),
       id_state_map_(id_state_map),
       source_(source) {}
 
 P2PNotificationData::~P2PNotificationData() {}
 
 bool P2PNotificationData::IsTargeted(const std::string& id) const {
   switch (target_) {
     case NOTIFY_SELF:
       return sender_id_ == id;
     case NOTIFY_OTHERS:
       return sender_id_ != id;
     case NOTIFY_ALL:
       return true;
     default:
       NOTREACHED();
       return false;
   }
 }
 
 const ObjectIdStateMap& P2PNotificationData::GetIdStateMap() const {
   return id_state_map_;
 }
 
-IncomingNotificationSource P2PNotificationData::GetSource() const {
+IncomingInvalidationSource P2PNotificationData::GetSource() const {
   return source_;
 }
 
 bool P2PNotificationData::Equals(const P2PNotificationData& other) const {
   return
       (sender_id_ == other.sender_id_) &&
       (target_ == other.target_) &&
       ObjectIdStateMapEquals(id_state_map_, other.id_state_map_) &&
       (source_ == other.source_);
 }
@@ skipping 66 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   ObjectIdSet new_ids;
   const ObjectIdSet& old_ids = registrar_.GetRegisteredIds(handler);
   std::set_difference(ids.begin(), ids.end(),
                       old_ids.begin(), old_ids.end(),
                       std::inserter(new_ids, new_ids.end()),
                       ObjectIdLessThan());
   registrar_.UpdateRegisteredIds(handler, ids);
   const P2PNotificationData notification_data(
       unique_id_, NOTIFY_SELF, ObjectIdSetToStateMap(new_ids, ""),
-      REMOTE_NOTIFICATION);
+      REMOTE_INVALIDATION);
   SendNotificationData(notification_data);
 }
 
 void P2PInvalidator::UnregisterHandler(InvalidationHandler* handler) {
   DCHECK(thread_checker_.CalledOnValidThread());
   registrar_.UnregisterHandler(handler);
 }
 
+InvalidatorState P2PInvalidator::GetInvalidatorState() const {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  return registrar_.GetInvalidatorState();
+}
+
 void P2PInvalidator::SetUniqueId(const std::string& unique_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   unique_id_ = unique_id;
 }
 
 void P2PInvalidator::SetStateDeprecated(const std::string& state) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Do nothing.
 }
 
 void P2PInvalidator::UpdateCredentials(
     const std::string& email, const std::string& token) {
   DCHECK(thread_checker_.CalledOnValidThread());
   notifier::Subscription subscription;
   subscription.channel = kSyncP2PNotificationChannel;
   // There may be some subtle issues around case sensitivity of the
   // from field, but it doesn't matter too much since this is only
   // used in p2p mode (which is only used in testing).
   subscription.from = email;
   push_client_->UpdateSubscriptions(
       notifier::SubscriptionList(1, subscription));
   // If already logged in, the new credentials will take effect on the
   // next reconnection.
   push_client_->UpdateCredentials(email, token);
   logged_in_ = true;
 }
 
-void P2PInvalidator::SendNotification(const ObjectIdStateMap& id_state_map) {
+void P2PInvalidator::SendInvalidation(const ObjectIdStateMap& id_state_map) {
   DCHECK(thread_checker_.CalledOnValidThread());
   const P2PNotificationData notification_data(
       unique_id_, send_notification_target_, id_state_map,
-      REMOTE_NOTIFICATION);
+      REMOTE_INVALIDATION);
   SendNotificationData(notification_data);
 }
 
 void P2PInvalidator::OnNotificationsEnabled() {
   DCHECK(thread_checker_.CalledOnValidThread());
   bool just_turned_on = (notifications_enabled_ == false);
   notifications_enabled_ = true;
-  registrar_.EmitOnNotificationsEnabled();
+  registrar_.UpdateInvalidatorState(INVALIDATIONS_ENABLED);
   if (just_turned_on) {
     const P2PNotificationData notification_data(
         unique_id_, NOTIFY_SELF,
         ObjectIdSetToStateMap(registrar_.GetAllRegisteredIds(), ""),
-        REMOTE_NOTIFICATION);
+        REMOTE_INVALIDATION);
     SendNotificationData(notification_data);
   }
 }
 
 void P2PInvalidator::OnNotificationsDisabled(
     notifier::NotificationsDisabledReason reason) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  registrar_.EmitOnNotificationsDisabled(FromNotifierReason(reason));
+  registrar_.UpdateInvalidatorState(FromNotifierReason(reason));
 }
 
 void P2PInvalidator::OnIncomingNotification(
     const notifier::Notification& notification) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DVLOG(1) << "Received notification " << notification.ToString();
   if (!logged_in_) {
     DVLOG(1) << "Not logged in yet -- not emitting notification";
     return;
   }
   if (!notifications_enabled_) {
     DVLOG(1) << "Notifications not on -- not emitting notification";
     return;
   }
   if (notification.channel != kSyncP2PNotificationChannel) {
     LOG(WARNING) << "Notification from unexpected source "
                  << notification.channel;
   }
   P2PNotificationData notification_data;
   if (!notification_data.ResetFromString(notification.data)) {
     LOG(WARNING) << "Could not parse notification data from "
                  << notification.data;
     notification_data =
         P2PNotificationData(
             unique_id_, NOTIFY_ALL,
             ObjectIdSetToStateMap(registrar_.GetAllRegisteredIds(), ""),
-            REMOTE_NOTIFICATION);
+            REMOTE_INVALIDATION);
   }
   if (!notification_data.IsTargeted(unique_id_)) {
     DVLOG(1) << "Not a target of the notification -- "
              << "not emitting notification";
     return;
   }
   registrar_.DispatchInvalidationsToHandlers(
       notification_data.GetIdStateMap(),
-      REMOTE_NOTIFICATION);
+      REMOTE_INVALIDATION);
 }
 
 void P2PInvalidator::SendNotificationDataForTest(
     const P2PNotificationData& notification_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SendNotificationData(notification_data);
 }
 
 void P2PInvalidator::SendNotificationData(
     const P2PNotificationData& notification_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (notification_data.GetIdStateMap().empty()) {
     DVLOG(1) << "Not sending XMPP notification with empty state map: "
              << notification_data.ToString();
     return;
   }
   notifier::Notification notification;
   notification.channel = kSyncP2PNotificationChannel;
   notification.data = notification_data.ToString();
   DVLOG(1) << "Sending XMPP notification: " << notification.ToString();
   push_client_->SendNotification(notification);
 }
 
 }  // namespace syncer