Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

jingle/notifier/communicator/login.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 "jingle/notifier/communicator/login.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 24 matching lines @@
                 request_context_getter,
              const ServerList& servers,
              bool try_ssltcp_first,
              const std::string& auth_mechanism)
     : delegate_(delegate),
       login_settings_(user_settings,
                       request_context_getter,
                       servers,
                       try_ssltcp_first,
                       auth_mechanism) {
-  net::NetworkChangeNotifier::AddIPAddressObserver(this);
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   // TODO(akalin): Add as DNSObserver once bug 130610 is fixed.
   ResetReconnectState();
 }
 
 Login::~Login() {
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
-  net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
 void Login::StartConnection() {
   DVLOG(1) << "Starting connection...";
   single_attempt_.reset(new SingleLoginAttempt(login_settings_, this));
 }
 
 void Login::UpdateXmppSettings(const buzz::XmppClientSettings& user_settings) {
   DVLOG(1) << "XMPP settings updated";
   login_settings_.set_user_settings(user_settings);
@@ skipping 23 matching lines @@
   TryReconnect();
   delegate_->OnCredentialsRejected();
 }
 
 void Login::OnSettingsExhausted() {
   DVLOG(1) << "Settings exhausted";
   TryReconnect();
   delegate_->OnTransientDisconnection();
 }
 
-void Login::OnIPAddressChanged() {
-  DVLOG(1) << "IP address changed";
-  OnNetworkEvent();
-}
-
-void Login::OnConnectionTypeChanged(
+void Login::OnNetworkChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
-  DVLOG(1) << "Connection type changed";
-  OnNetworkEvent();
+  if (type != net::NetworkChangeNotifier::CONNECTION_NONE) {
+    DVLOG(1) << "Network changed";
+    OnNetworkEvent();
+  }
 }
 
 void Login::OnDNSChanged() {
   DVLOG(1) << "DNS changed";
   OnNetworkEvent();
 }
 
 void Login::OnNetworkEvent() {
   // Reconnect in 1 to 9 seconds (vary the time a little to try to
   // avoid spikey behavior on network hiccups).
@@ skipping 23 matching lines @@
   const base::TimeDelta kMaxReconnectInterval =
       base::TimeDelta::FromMinutes(30);
   reconnect_interval_ *= 2;
   if (reconnect_interval_ > kMaxReconnectInterval)
     reconnect_interval_ = kMaxReconnectInterval;
   DVLOG(1) << "Reconnecting...";
   StartConnection();
 }
 
 }  // namespace notifier