[Sync] Propagate XMPP auth errors to SyncNotifierObservers

jingle/notifier/communicator/single_login_attempt.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 <string>
 
 #include "jingle/notifier/communicator/single_login_attempt.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 21 matching lines @@
       current_settings_(settings_list_.begin()) {
   if (settings_list_.empty()) {
     NOTREACHED();
     return;
   }
   TryConnect(*current_settings_);
 }
 
 SingleLoginAttempt::~SingleLoginAttempt() {}
 
+// In the code below, we assume that calling a delegate method may end
+// up in ourselves being deleted, so we always call it last.
+//
+// TODO(akalin): Add unit tests to enforce the behavior above.
+
 void SingleLoginAttempt::OnConnect(
     base::WeakPtr<buzz::XmppTaskParentInterface> base_task) {
   DVLOG(1) << "Connected to " << current_settings_->ToString();
   delegate_->OnConnect(base_task);
 }
 
 namespace {
 
 // This function is more permissive than
 // net::HostPortPair::FromString().  If the port is missing or
@@ skipping 72 matching lines @@
               ServerInformation(
                   redirect_server,
                   current_settings_->ssltcp_support));
           // May be deleted at this point.
           return;
         }
       }
     }
   }
 
+  if (error == buzz::XmppEngine::ERROR_UNAUTHORIZED) {
+    delegate_->OnCredentialsRejected();
+    return;
+  }
+
   if (current_settings_ == settings_list_.end()) {
     NOTREACHED();
     return;
   }
 
   ++current_settings_;
   if (current_settings_ == settings_list_.end()) {
     VLOG(1) << "Could not connect to any XMPP server";
-    delegate_->OnNeedReconnect();
+    delegate_->OnSettingsExhausted();
     return;
   }
 
   TryConnect(*current_settings_);
 }
 
 void SingleLoginAttempt::TryConnect(
     const ConnectionSettings& connection_settings) {
   DVLOG(1) << "Trying to connect to " << connection_settings.ToString();
   // Copy the user settings and fill in the connection parameters from
   // |connection_settings|.
   buzz::XmppClientSettings client_settings = login_settings_.user_settings();
   connection_settings.FillXmppClientSettings(&client_settings);
 
   buzz::Jid jid(client_settings.user(), client_settings.host(),
                 buzz::STR_EMPTY);
   buzz::PreXmppAuth* pre_xmpp_auth =
       new GaiaTokenPreXmppAuth(
           jid.Str(), client_settings.auth_token(),
           client_settings.token_service(),
           login_settings_.auth_mechanism());
   xmpp_connection_.reset(
       new XmppConnection(client_settings,
                          login_settings_.request_context_getter(),
                          this,
                          pre_xmpp_auth));
 }
 
 }  // namespace notifier