Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 3740513eb525545e55c466265a32dee3f95f1576..625507e38f00d566fc8eb6e26a3e3835fed15d17 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -233,20 +233,20 @@ int GetSwitchValueAsInt(const CommandLine& command_line,
 
 }  // namespace
 
-class IOThread::LoggingNetworkChangeObserver
+class IOThreadLoggingNetworkChangeObserver
     : public net::NetworkChangeNotifier::IPAddressObserver,
       public net::NetworkChangeNotifier::ConnectionTypeObserver,
       public net::NetworkChangeNotifier::NetworkChangeObserver {
  public:
   // |net_log| must remain valid throughout our lifetime.
-  explicit LoggingNetworkChangeObserver(net::NetLog* net_log)
+  explicit IOThreadLoggingNetworkChangeObserver(net::NetLog* net_log)
       : net_log_(net_log) {
-    net::NetworkChangeNotifier::AddIPAddressObserver(this);
-    net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+    net::NetworkChangeNotifier::Deprecated::AddIPAddressObserver(this);
+    net::NetworkChangeNotifier::Deprecated::AddConnectionTypeObserver(this);
     net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   }
 
-  ~LoggingNetworkChangeObserver() {
+  ~IOThreadLoggingNetworkChangeObserver() {
     net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
     net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
     net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
@@ -288,7 +288,7 @@ class IOThread::LoggingNetworkChangeObserver
 
  private:
   net::NetLog* net_log_;
-  DISALLOW_COPY_AND_ASSIGN(LoggingNetworkChangeObserver);
+  DISALLOW_COPY_AND_ASSIGN(IOThreadLoggingNetworkChangeObserver);
 };
 
 class SystemURLRequestContextGetter : public net::URLRequestContextGetter {
@@ -460,7 +460,7 @@ void IOThread::Init() {
   // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be
   // logging the network change before other IO thread consumers respond to it.
   network_change_observer_.reset(
-      new LoggingNetworkChangeObserver(net_log_));
+      new IOThreadLoggingNetworkChangeObserver(net_log_));
 
   // Setup the HistogramWatcher to run on the IO thread.
   net::NetworkChangeNotifier::InitHistogramWatcher();