Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

net/tools/net_watcher/net_watcher.cc

 // 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.
 
 // This is a small utility that watches for and logs network changes.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
@@ skipping 58 matching lines @@
       return "CONFIG_PENDING";
     case net::ProxyConfigService::CONFIG_VALID:
       return "CONFIG_VALID";
     case net::ProxyConfigService::CONFIG_UNSET:
       return "CONFIG_UNSET";
     default:
       return "CONFIG_UNEXPECTED";
   }
 }
 
+}  // namespace
+
 // The main observer class that logs network events.
 class NetWatcher :
       public net::NetworkChangeNotifier::IPAddressObserver,
       public net::NetworkChangeNotifier::ConnectionTypeObserver,
       public net::NetworkChangeNotifier::DNSObserver,
       public net::NetworkChangeNotifier::NetworkChangeObserver,
       public net::ProxyConfigService::Observer {
  public:
   NetWatcher() {}
+  virtual ~NetWatcher() {
+    net::NetworkChangeNotifier::RemoveDNSObserver(this);
+    net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+    net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
+    net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
+  }
 
-  virtual ~NetWatcher() {}
+  void Init() {
+    net::NetworkChangeNotifier::Deprecated::AddIPAddressObserver(this);
+    net::NetworkChangeNotifier::Deprecated::AddConnectionTypeObserver(this);
+    net::NetworkChangeNotifier::AddDNSObserver(this);
+    net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
+  }
 
   // net::NetworkChangeNotifier::IPAddressObserver implementation.
   virtual void OnIPAddressChanged() OVERRIDE {
     LOG(INFO) << "OnIPAddressChanged()";
   }
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver implementation.
   virtual void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE {
     LOG(INFO) << "OnConnectionTypeChanged("
@@ skipping 18 matching lines @@
       net::ProxyConfigService::ConfigAvailability availability) OVERRIDE {
     LOG(INFO) << "OnProxyConfigChanged("
               << ProxyConfigToString(config) << ", "
               << ConfigAvailabilityToString(availability) << ")";
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetWatcher);
 };
 
-}  // namespace
-
 int main(int argc, char* argv[]) {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
 #if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS)
   // Needed so ProxyConfigServiceLinux can use gconf.
   // Normally handled by BrowserMainLoop::InitializeToolkit().
   g_type_init();
 #endif
   base::AtExitManager exit_manager;
   CommandLine::Init(argc, argv);
   logging::InitLogging(
       NULL,
       logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
       logging::LOCK_LOG_FILE,
       logging::DELETE_OLD_LOG_FILE,
       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
 
   // Just make the main message loop the network loop.
   MessageLoopForIO network_loop;
 
-  NetWatcher net_watcher;
-
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier(
       net::NetworkChangeNotifier::Create());
 
   // Use the network loop as the file loop also.
   scoped_ptr<net::ProxyConfigService> proxy_config_service(
       net::ProxyService::CreateSystemProxyConfigService(
           network_loop.message_loop_proxy(),
           &network_loop));
 
+  // Destruction uses |network_change_notifier| so define after.
+  NetWatcher net_watcher;
   // Uses |network_change_notifier|.
-  net::NetworkChangeNotifier::AddIPAddressObserver(&net_watcher);
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(&net_watcher);
-  net::NetworkChangeNotifier::AddDNSObserver(&net_watcher);
-  net::NetworkChangeNotifier::AddNetworkChangeObserver(&net_watcher);
+  net_watcher.Init();
 
   proxy_config_service->AddObserver(&net_watcher);
 
   LOG(INFO) << "Initial connection type: "
             << ConnectionTypeToString(
                 network_change_notifier->GetCurrentConnectionType());
 
   {
     net::ProxyConfig config;
     const net::ProxyConfigService::ConfigAvailability availability =
         proxy_config_service->GetLatestProxyConfig(&config);
     LOG(INFO) << "Initial proxy config: "
               << ProxyConfigToString(config) << ", "
               << ConfigAvailabilityToString(availability);
   }
 
   LOG(INFO) << "Watching for network events...";
 
   // Start watching for events.
   network_loop.Run();
 
   proxy_config_service->RemoveObserver(&net_watcher);
 
-  // Uses |network_change_notifier|.
-  net::NetworkChangeNotifier::RemoveDNSObserver(&net_watcher);
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(&net_watcher);
-  net::NetworkChangeNotifier::RemoveIPAddressObserver(&net_watcher);
-  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(&net_watcher);
-
   return 0;
 }