Start calculating new combined NetworkChangeNotifier signal

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 63 matching lines @@
     default:
       return "CONFIG_UNEXPECTED";
   }
 }
 
 // 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::IPAddressObserver implementation.
   virtual void OnIPAddressChanged() OVERRIDE {
     LOG(INFO) << "OnIPAddressChanged()";
   }
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver implementation.
   virtual void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE {
     LOG(INFO) << "OnConnectionTypeChanged("
               << ConnectionTypeToString(type) << ")";
   }
 
   // net::NetworkChangeNotifier::DNSObserver implementation.
   virtual void OnDNSChanged() OVERRIDE {
     LOG(INFO) << "OnDNSChanged()";
   }
 
+  // net::NetworkChangeNotifier::NetworkChangeObserver implementation.
+  virtual void OnNetworkChanged(
+      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE {
+    LOG(INFO) << "OnNetworkChanged("
+              << ConnectionTypeToString(type) << ")";
+  }
+
   // net::ProxyConfigService::Observer implementation.
   virtual void OnProxyConfigChanged(
       const net::ProxyConfig& config,
       net::ProxyConfigService::ConfigAvailability availability) OVERRIDE {
     LOG(INFO) << "OnProxyConfigChanged("
               << ProxyConfigToString(config) << ", "
               << ConfigAvailabilityToString(availability) << ")";
   }
 
  private:
@@ skipping 31 matching lines @@
   // 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));
 
   // Uses |network_change_notifier|.
   net::NetworkChangeNotifier::AddIPAddressObserver(&net_watcher);
   net::NetworkChangeNotifier::AddConnectionTypeObserver(&net_watcher);
   net::NetworkChangeNotifier::AddDNSObserver(&net_watcher);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(&net_watcher);
 
   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;
 }