Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

net/proxy/proxy_service.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 NET_PROXY_PROXY_SERVICE_H_
 #define NET_PROXY_PROXY_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 24 matching lines @@
 class HostResolver;
 class NetworkDelegate;
 class ProxyResolver;
 class ProxyResolverScriptData;
 class ProxyScriptDecider;
 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;
 
   // This interface defines the set of policies for when to poll the PAC
   // script for changes.
   //
   // The polling policy decides what the next poll delay should be in
   // milliseconds. It also decides how to wait for this delay -- either
   // by starting a timer to do the poll at exactly |next_delay_ms|
   // (MODE_USE_TIMER) or by waiting for the first network request issued after
@@ skipping 262 matching lines @@
 
   // Start initialization using |fetched_config_|.
   void InitializeUsingLastFetchedConfig();
 
   // Start the initialization skipping past the "decision" phase.
   void InitializeUsingDecidedConfig(
       int decider_result,
       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.
   virtual void OnDNSChanged() OVERRIDE;
 
   // ProxyConfigService::Observer
   virtual void OnProxyConfigChanged(
       const ProxyConfig& config,
       ProxyConfigService::ConfigAvailability availability) OVERRIDE;
 
@@ skipping 88 matching lines @@
 
   base::WaitableEvent event_;
   CompletionCallback callback_;
   ProxyInfo proxy_info_;
   int result_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_