[Sync] Propagate XMPP auth errors to SyncNotifierObservers

sync/notifier/non_blocking_invalidation_notifier.cc

Index: sync/notifier/non_blocking_invalidation_notifier.cc
diff --git a/sync/notifier/non_blocking_invalidation_notifier.cc b/sync/notifier/non_blocking_invalidation_notifier.cc
index f9a7bd13787ff2fff020b0839eb2ac4f7fe8aaea..a92bd66430b35dec586992813aa636b1543cdb5b 100644
--- a/sync/notifier/non_blocking_invalidation_notifier.cc
+++ b/sync/notifier/non_blocking_invalidation_notifier.cc
@@ -42,10 +42,12 @@ class NonBlockingInvalidationNotifier::Core
 
   // SyncNotifierObserver implementation (all called on I/O thread by
   // InvalidationNotifier).
+  virtual void OnNotificationsEnabled() OVERRIDE;
+  virtual void OnNotificationsDisabled(
+      NotificationsDisabledReason reason) OVERRIDE;
   virtual void OnIncomingNotification(
       const syncable::ModelTypePayloadMap& type_payloads,
-      IncomingNotificationSource source);
-  virtual void OnNotificationStateChange(bool notifications_enabled);
+      IncomingNotificationSource source) OVERRIDE;
 
  private:
   friend class
@@ -126,22 +128,27 @@ void NonBlockingInvalidationNotifier::Core::UpdateEnabledTypes(
   invalidation_notifier_->UpdateEnabledTypes(enabled_types);
 }
 
-void NonBlockingInvalidationNotifier::Core::OnIncomingNotification(
-        const syncable::ModelTypePayloadMap& type_payloads,
-        IncomingNotificationSource source) {
+void NonBlockingInvalidationNotifier::Core::OnNotificationsEnabled() {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   delegate_observer_.Call(FROM_HERE,
-                          &SyncNotifierObserver::OnIncomingNotification,
-                          type_payloads,
-                          source);
+                          &SyncNotifierObserver::OnNotificationsEnabled);
 }
 
-void NonBlockingInvalidationNotifier::Core::OnNotificationStateChange(
-        bool notifications_enabled) {
+void NonBlockingInvalidationNotifier::Core::OnNotificationsDisabled(
+    NotificationsDisabledReason reason) {
+  DCHECK(network_task_runner_->BelongsToCurrentThread());
+  delegate_observer_.Call(
+      FROM_HERE, &SyncNotifierObserver::OnNotificationsDisabled, reason);
+}
+
+void NonBlockingInvalidationNotifier::Core::OnIncomingNotification(
+    const syncable::ModelTypePayloadMap& type_payloads,
+    IncomingNotificationSource source) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   delegate_observer_.Call(FROM_HERE,
-                          &SyncNotifierObserver::OnNotificationStateChange,
-                          notifications_enabled);
+                          &SyncNotifierObserver::OnIncomingNotification,
+                          type_payloads,
+                          source);
 }
 
 NonBlockingInvalidationNotifier::NonBlockingInvalidationNotifier(
@@ -247,19 +254,25 @@ void NonBlockingInvalidationNotifier::SendNotification(
   // need to forward on the call.
 }
 
-void NonBlockingInvalidationNotifier::OnIncomingNotification(
-        const syncable::ModelTypePayloadMap& type_payloads,
-        IncomingNotificationSource source) {
+void NonBlockingInvalidationNotifier::OnNotificationsEnabled() {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   FOR_EACH_OBSERVER(SyncNotifierObserver, observers_,
-                    OnIncomingNotification(type_payloads, source));
+                    OnNotificationsEnabled());
+}
+
+void NonBlockingInvalidationNotifier::OnNotificationsDisabled(
+    NotificationsDisabledReason reason) {
+  DCHECK(parent_task_runner_->BelongsToCurrentThread());
+  FOR_EACH_OBSERVER(SyncNotifierObserver, observers_,
+                    OnNotificationsDisabled(reason));
 }
 
-void NonBlockingInvalidationNotifier::OnNotificationStateChange(
-        bool notifications_enabled) {
+void NonBlockingInvalidationNotifier::OnIncomingNotification(
+        const syncable::ModelTypePayloadMap& type_payloads,
+        IncomingNotificationSource source) {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   FOR_EACH_OBSERVER(SyncNotifierObserver, observers_,
-                    OnNotificationStateChange(notifications_enabled));
+                    OnIncomingNotification(type_payloads, source));
 }
 
 }  // namespace sync_notifier