Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

jingle/notifier/communicator/login.h

Index: jingle/notifier/communicator/login.h
diff --git a/jingle/notifier/communicator/login.h b/jingle/notifier/communicator/login.h
index 1fffb92832dba5fdb59ec8d28c6eac60a747a050..4ad060dc33d86261d0952c2f3df7cf783f4fb903 100644
--- a/jingle/notifier/communicator/login.h
+++ b/jingle/notifier/communicator/login.h
@@ -38,8 +38,7 @@ class LoginSettings;
 // 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:
@@ -82,11 +81,8 @@ class Login : public net::NetworkChangeNotifier::IPAddressObserver,
   // 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.