[Sync] Propagate XMPP auth errors to SyncNotifierObservers

sync/internal_api/sync_manager.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/internal_api/sync_manager.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 300 matching lines @@
 
   // Open the directory named with username_for_share
   bool OpenDirectory();
 
   // Cryptographer::Observer implementation.
   virtual void OnEncryptedTypesChanged(
       syncable::ModelTypeSet encrypted_types,
       bool encrypt_everything) OVERRIDE;
 
   // SyncNotifierObserver implementation.
-  virtual void OnNotificationStateChange(
-      bool notifications_enabled) OVERRIDE;
-
   virtual void OnIncomingNotification(
       const syncable::ModelTypePayloadMap& type_payloads,
       sync_notifier::IncomingNotificationSource source) OVERRIDE;
+  virtual void OnSyncNotifierStateChange(
+      sync_notifier::SyncNotifierState sync_notifier_state) OVERRIDE;
 
   void AddObserver(SyncManager::Observer* observer);
   void RemoveObserver(SyncManager::Observer* observer);
 
   // Accessors for the private members.
   syncable::Directory* directory() { return share_.directory.get(); }
   SyncAPIServerConnectionManager* connection_manager() {
     return connection_manager_.get();
   }
   SyncSessionContext* session_context() { return session_context_.get(); }
@@ skipping 1951 matching lines @@
 
 void SyncManager::SyncInternal::OnEncryptedTypesChanged(
     syncable::ModelTypeSet encrypted_types,
     bool encrypt_everything) {
   // NOTE: We're in a transaction.
   FOR_EACH_OBSERVER(
       SyncManager::Observer, observers_,
       OnEncryptedTypesChanged(encrypted_types, encrypt_everything));
 }
 
-void SyncManager::SyncInternal::OnNotificationStateChange(
-    bool notifications_enabled) {
-  DVLOG(1) << "P2P: Notifications enabled = "
-           << (notifications_enabled ? "true" : "false");
+void SyncManager::SyncInternal::UpdateNotificationInfo(
+    const syncable::ModelTypePayloadMap& type_payloads) {
+  for (syncable::ModelTypePayloadMap::const_iterator it = type_payloads.begin();
+       it != type_payloads.end(); ++it) {
+    NotificationInfo* info = &notification_info_map_[it->first];
+    info->total_count++;
+    info->payload = it->second;
+  }
+}
+
+void SyncManager::SyncInternal::OnSyncNotifierStateChange(
+    sync_notifier::SyncNotifierState sync_notifier_state) {
+  DVLOG(1) << "SyncNotifierState: "
+           << sync_notifier::SyncNotifierStateToString(
+               sync_notifier_state);
+  const bool notifications_enabled =
+      (sync_notifier_state == sync_notifier::NOTIFICATIONS_ON);
   allstatus_.SetNotificationsEnabled(notifications_enabled);
   if (scheduler()) {
     scheduler()->set_notifications_enabled(notifications_enabled);
   }
   if (js_event_handler_.IsInitialized()) {
     DictionaryValue details;
     details.Set("enabled", Value::CreateBooleanValue(notifications_enabled));
     js_event_handler_.Call(FROM_HERE,
                            &JsEventHandler::HandleJsEvent,
                            "onNotificationStateChange",
                            JsEventDetails(&details));
   }
-}
-
-void SyncManager::SyncInternal::UpdateNotificationInfo(
-    const syncable::ModelTypePayloadMap& type_payloads) {
-  for (syncable::ModelTypePayloadMap::const_iterator it = type_payloads.begin();
-       it != type_payloads.end(); ++it) {
-    NotificationInfo* info = &notification_info_map_[it->first];
-    info->total_count++;
-    info->payload = it->second;
-  }
+  // TODO(akalin): Treat a CREDENTIALS_REJECTED state as an auth
+  // error.
 }
 
 void SyncManager::SyncInternal::OnIncomingNotification(
     const syncable::ModelTypePayloadMap& type_payloads,
     sync_notifier::IncomingNotificationSource source) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (source == sync_notifier::LOCAL_NOTIFICATION) {
     if (scheduler()) {
       scheduler()->ScheduleNudgeWithPayloadsAsync(
           TimeDelta::FromMilliseconds(kSyncRefreshDelayMsec),
@@ skipping 93 matching lines @@
     found_experiment = true;
   }
   return found_experiment;
 }
 
 bool SyncManager::HasUnsyncedItems() const {
   sync_api::ReadTransaction trans(FROM_HERE, GetUserShare());
   return (trans.GetWrappedTrans()->directory()->unsynced_entity_count() != 0);
 }
 
-void SyncManager::TriggerOnNotificationStateChangeForTest(
-    bool notifications_enabled) {
+void SyncManager::TriggerOnSyncNotifierStateChangeForTest(
+    sync_notifier::SyncNotifierState sync_notifier_state) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  data_->OnNotificationStateChange(notifications_enabled);
+  data_->OnSyncNotifierStateChange(sync_notifier_state);
 }
 
 void SyncManager::TriggerOnIncomingNotificationForTest(
     ModelTypeSet model_types) {
   DCHECK(thread_checker_.CalledOnValidThread());
   syncable::ModelTypePayloadMap model_types_with_payloads =
       syncable::ModelTypePayloadMapFromEnumSet(model_types,
           std::string());
 
   data_->OnIncomingNotification(model_types_with_payloads,
@@ skipping 51 matching lines @@
     share->directory->GetDownloadProgress(i.Get(), &marker);
 
     if (marker.token().empty())
       result.Put(i.Get());
 
   }
   return result;
 }
 
 }  // namespace sync_api