Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

net/dns/dns_config_service_win.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_DNS_DNS_CONFIG_SERVICE_WIN_H_
 #define NET_DNS_DNS_CONFIG_SERVICE_WIN_H_
 
 // The sole purpose of dns_config_service_win.h is for unittests so we just
 // include these headers here.
 #include <winsock2.h>
@@ skipping 106 matching lines @@
 };
 
 // Fills in |dns_config| from |settings|. Exposed for tests.
 ConfigParseWinResult NET_EXPORT_PRIVATE ConvertSettingsToDnsConfig(
     const DnsSystemSettings& settings,
     DnsConfig* dns_config);
 
 // Use DnsConfigService::CreateSystemService to use it outside of tests.
 class NET_EXPORT_PRIVATE DnsConfigServiceWin : public DnsConfigService {
  public:
+  class Watcher;

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

Why is this necessary? Can't you friend it when it's private?

+
   DnsConfigServiceWin();
   virtual ~DnsConfigServiceWin();
 
  private:
-  class Watcher;
   class ConfigReader;
   class HostsReader;
 
   // DnsConfigService:
   virtual void ReadNow() OVERRIDE;
   virtual bool StartWatching() OVERRIDE;
 
   void OnConfigChanged(bool succeeded);
   void OnHostsChanged(bool succeeded);
 
   scoped_ptr<Watcher> watcher_;
   scoped_refptr<ConfigReader> config_reader_;
   scoped_refptr<HostsReader> hosts_reader_;
 
   DISALLOW_COPY_AND_ASSIGN(DnsConfigServiceWin);
 };
 
 }  // namespace internal
 
 }  // namespace net
 
 #endif  // NET_DNS_DNS_CONFIG_SERVICE_WIN_H_