[Sync] Propagate XMPP auth errors to SyncNotifierObservers

sync/notifier/p2p_notifier.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_notifier.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 194 matching lines @@
 }
 
 void P2PNotifier::SendNotification(
     syncable::ModelTypeSet changed_types) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   const P2PNotificationData notification_data(
       unique_id_, send_notification_target_, changed_types);
   SendNotificationData(notification_data);
 }
 
-void P2PNotifier::OnNotificationStateChange(bool notifications_enabled) {
+void P2PNotifier::OnNotificationsEnabled() {
   DCHECK(non_thread_safe_.CalledOnValidThread());
-  bool disabled_to_enabled = notifications_enabled && !notifications_enabled_;
-  notifications_enabled_ = notifications_enabled;
-  FOR_EACH_OBSERVER(SyncNotifierObserver, observer_list_,
-      OnNotificationStateChange(notifications_enabled_));
-  if (disabled_to_enabled) {
+  bool just_turned_on = (notifications_enabled_ == false);
+  notifications_enabled_ = true;
+  FOR_EACH_OBSERVER(
+      SyncNotifierObserver, observer_list_,
+      OnNotificationsEnabled());
+  if (just_turned_on) {
     const P2PNotificationData notification_data(
         unique_id_, NOTIFY_SELF, enabled_types_);
     SendNotificationData(notification_data);
   }
 }
 
+void P2PNotifier::OnNotificationsDisabled(
+    notifier::NotificationsDisabledReason reason) {
+  DCHECK(non_thread_safe_.CalledOnValidThread());
+  FOR_EACH_OBSERVER(
+      SyncNotifierObserver, observer_list_,
+      OnNotificationsDisabled(FromNotifierReason(reason)));
+}
+
 void P2PNotifier::OnIncomingNotification(
     const notifier::Notification& notification) {
   DCHECK(non_thread_safe_.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 enabled -- not emitting notification";
+    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;
@@ skipping 26 matching lines @@
     const P2PNotificationData& notification_data) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   notifier::Notification notification;
   notification.channel = kSyncP2PNotificationChannel;
   notification.data = notification_data.ToString();
   DVLOG(1) << "Sending XMPP notification: " << notification.ToString();
   push_client_->SendNotification(notification);
 }
 
 }  // namespace sync_notifier