[Sync] Propagate XMPP auth errors to SyncNotifierObservers

sync/notifier/p2p_notifier.h

 // 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.
 //
 // A notifier that uses p2p notifications based on XMPP push
 // notifications.  Used only for sync integration tests.
 
 #ifndef SYNC_NOTIFIER_P2P_NOTIFIER_H_
 #define SYNC_NOTIFIER_P2P_NOTIFIER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "jingle/notifier/listener/push_client_observer.h"
 #include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/notifier/notifications_disabled_reason.h"
 #include "sync/notifier/sync_notifier.h"
 
 namespace notifier {
 class PushClient;
 }  // namespace notifier
 
 namespace sync_notifier {
 
 // The channel to use for sync notifications.
 extern const char* kSyncP2PNotificationChannel;
@@ skipping 69 matching lines @@
   virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
   virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE;
   virtual void UpdateEnabledTypes(
       syncable::ModelTypeSet enabled_types) OVERRIDE;
   virtual void SendNotification(
       syncable::ModelTypeSet changed_types) OVERRIDE;
 
   // PushClientObserver implementation.
-  virtual void OnNotificationStateChange(bool notifications_enabled) OVERRIDE;
+  virtual void OnNotificationsEnabled() OVERRIDE;
+  virtual void OnNotificationsDisabled(
+      notifier::NotificationsDisabledReason reason) OVERRIDE;
   virtual void OnIncomingNotification(
       const notifier::Notification& notification) OVERRIDE;
 
   void SendNotificationDataForTest(
       const P2PNotificationData& notification_data);
 
  private:
   void SendNotificationData(const P2PNotificationData& notification_data);
 
   base::NonThreadSafe non_thread_safe_;
 
   ObserverList<SyncNotifierObserver> observer_list_;
 
   // The push client.
   scoped_ptr<notifier::PushClient> push_client_;
   // Our unique ID.
   std::string unique_id_;
   // Whether we have called UpdateCredentials() yet.
   bool logged_in_;
-  // Whether |push_client_| has notified us that notifications are
-  // enabled.
   bool notifications_enabled_;
   // Which set of clients should be sent notifications.
   P2PNotificationTarget send_notification_target_;
 
   syncable::ModelTypeSet enabled_types_;
 };
 
 }  // namespace sync_notifier
 
 #endif  // SYNC_NOTIFIER_P2P_NOTIFIER_H_