Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

net/proxy/proxy_service.h

Index: net/proxy/proxy_service.h
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 6eab86a6413ff2ad2c191d41d8d86e98f22c0e90..4a9f709ad93fa6bd88bc883f38056fec45b6d22c 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -42,10 +42,11 @@ class ProxyScriptFetcher;
 // This class can be used to resolve the proxy server to use when loading a
 // HTTP(S) URL.  It uses the given ProxyResolver to handle the actual proxy
 // resolution.  See ProxyResolverV8 for example.
-class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
-                                public NetworkChangeNotifier::DNSObserver,
-                                public ProxyConfigService::Observer,
-                                NON_EXPORTED_BASE(public base::NonThreadSafe) {
+class NET_EXPORT ProxyService
+    : public NetworkChangeNotifier::NetworkChangeObserver,
+      public NetworkChangeNotifier::DNSObserver,
+      public ProxyConfigService::Observer,
+      NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   static const size_t kDefaultNumPacThreads = 4;
 
@@ -328,9 +329,10 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
       ProxyResolverScriptData* script_data,
       const ProxyConfig& effective_config);
 
-  // NetworkChangeNotifier::IPAddressObserver
+  // NetworkChangeNotifier::NetworkChangeObserver
   // When this is called, we re-fetch PAC scripts and re-run WPAD.
-  virtual void OnIPAddressChanged() OVERRIDE;
+  virtual void OnNetworkChanged(
+      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
   // NetworkChangeNotifier::DNSObserver
   // We respond as above.