Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

jingle/notifier/communicator/login.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.
 
 #ifndef JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_H_
 #define JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 20 matching lines @@
 
 namespace notifier {
 
 class LoginSettings;
 
 // Does the login, keeps it alive (with refreshing cookies and
 // reattempting login when disconnected), and figures out what actions
 // to take on the various errors that may occur.
 //
 // TODO(akalin): Make this observe proxy config changes also.
-class Login : public net::NetworkChangeNotifier::IPAddressObserver,
-              public net::NetworkChangeNotifier::ConnectionTypeObserver,
+class Login : public net::NetworkChangeNotifier::NetworkChangeObserver,
               public net::NetworkChangeNotifier::DNSObserver,
               public SingleLoginAttempt::Delegate {
  public:
   class Delegate {
    public:
     // Called when a connection has been successfully established.
     virtual void OnConnect(
         base::WeakPtr<buzz::XmppTaskParentInterface> base_task) = 0;
 
     // Called when there's no connection to the server but we expect
@@ skipping 22 matching lines @@
   virtual ~Login();
 
   // Starts connecting (or forces a reconnection if we're backed off).
   void StartConnection();
 
   // The updated settings take effect only the next time when a
   // connection is attempted (either via reconnection or a call to
   // StartConnection()).
   void UpdateXmppSettings(const buzz::XmppClientSettings& user_settings);
 
-  // net::NetworkChangeNotifier::IPAddressObserver implementation.
-  virtual void OnIPAddressChanged() OVERRIDE;
-
-  // net::NetworkChangeNotifier::ConnectionTypeObserver implementation.
-  virtual void OnConnectionTypeChanged(
+  // net::NetworkChangeNotifier::NetworkChangeObserver implementation.
+  virtual void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
   // net::NetworkChangeNotifier::DNSObserver implementation.
   virtual void OnDNSChanged() OVERRIDE;
 
   // SingleLoginAttempt::Delegate implementation.
   virtual void OnConnect(
       base::WeakPtr<buzz::XmppTaskParentInterface> base_task) OVERRIDE;
   virtual void OnRedirect(const ServerInformation& redirect_server) OVERRIDE;
   virtual void OnCredentialsRejected() OVERRIDE;
@@ skipping 22 matching lines @@
   // reconnection state.
   base::TimeDelta reconnect_interval_;
   base::OneShotTimer<Login> reconnect_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(Login);
 };
 
 }  // namespace notifier
 
 #endif  // JINGLE_NOTIFIER_COMMUNICATOR_LOGIN_H_