Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

net/url_request/url_request_throttler_manager.h

Index: net/url_request/url_request_throttler_manager.h
diff --git a/net/url_request/url_request_throttler_manager.h b/net/url_request/url_request_throttler_manager.h
index 962383430cb2dd9967a8269d25e9818d9375ef50..980b1e93ee3f3df02feff2ce5526928cb8edd663 100644
--- a/net/url_request/url_request_throttler_manager.h
+++ b/net/url_request/url_request_throttler_manager.h
@@ -34,8 +34,7 @@ class NetLog;
 // and path. All URLs converted to the same ID will share the same entry.
 class NET_EXPORT URLRequestThrottlerManager
     : NON_EXPORTED_BASE(public base::NonThreadSafe),
-      public NetworkChangeNotifier::IPAddressObserver,
-      public NetworkChangeNotifier::ConnectionTypeObserver {
+      public NetworkChangeNotifier::NetworkChangeObserver {
  public:
   URLRequestThrottlerManager();
   virtual ~URLRequestThrottlerManager();
@@ -77,11 +76,15 @@ class NET_EXPORT URLRequestThrottlerManager
   void set_net_log(NetLog* net_log);
   NetLog* net_log() const;
 
-  // IPAddressObserver interface.
-  virtual void OnIPAddressChanged() OVERRIDE;
-
-  // ConnectionTypeObserver interface.
-  virtual void OnConnectionTypeChanged(
+  // NetworkChangeNotifier::NetworkChangeObserver interface.
+  // When we switch from online to offline or change IP addresses, we
+  // clear all back-off history. This is a precaution in case the change in
+  // online state now lets us communicate without error with servers that
+  // we were previously getting 500 or 503 responses from (perhaps the
+  // responses are from a badly-written proxy that should have returned a
+  // 502 or 504 because it's upstream connection was down or it had no route
+  // to the server).
+  virtual void OnNetworkChanged(

[szym, 2013/01/20 06:52:08]

You should keep the orders of declarations and definitions in sync, so this
should probably go where OnNetworkChange was.

       NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
   // Method that allows us to transform a URL into an ID that can be used in our
@@ -99,15 +102,6 @@ class NET_EXPORT URLRequestThrottlerManager
   // Method that does the actual work of garbage collecting.
   void GarbageCollectEntries();
 
-  // When we switch from online to offline or change IP addresses, we
-  // clear all back-off history. This is a precaution in case the change in
-  // online state now lets us communicate without error with servers that
-  // we were previously getting 500 or 503 responses from (perhaps the
-  // responses are from a badly-written proxy that should have returned a
-  // 502 or 504 because it's upstream connection was down or it had no route
-  // to the server).
-  void OnNetworkChange();
-
   // Used by tests.
   int GetNumberOfEntriesForTests() const { return url_entries_.size(); }