[net] Move DnsConfigService to NetworkChangeNotifier.

net/dns/dns_config_service_win.h

Index: net/dns/dns_config_service_win.h
diff --git a/net/dns/dns_config_service_win.h b/net/dns/dns_config_service_win.h
index b0a29d0d6698e2db95b2f893ea32a22cde42e9af..4c3d8009efa83d05b595db2c89b8ad8a5b3e434f 100644
--- a/net/dns/dns_config_service_win.h
+++ b/net/dns/dns_config_service_win.h
@@ -17,6 +17,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "net/base/net_export.h"
+#include "net/base/network_change_notifier.h"
 #include "net/dns/dns_config_service.h"
 
 // The general effort of DnsConfigServiceWin is to configure |nameservers| and
@@ -129,18 +130,22 @@ class NET_EXPORT_PRIVATE DnsConfigServiceWin
   DnsConfigServiceWin();
   virtual ~DnsConfigServiceWin();
 
-  virtual void Watch(const CallbackType& callback) OVERRIDE;
-
  private:
+  class Watcher;
   class ConfigReader;
   class HostsReader;
 
-  // NetworkChangeNotifier::DNSObserver:
-  virtual void OnDNSChanged(unsigned detail) OVERRIDE;
+  // DnsConfigService:
+  virtual void ReadNow() OVERRIDE;
+  virtual bool StartWatching() OVERRIDE;
 
   // NetworkChangeNotifier::IPAddressObserver:
   virtual void OnIPAddressChanged() OVERRIDE;
 
+  void OnConfigChanged(bool succeeded);
+  void OnHostsChanged(bool succeeded);
+
+  scoped_ptr<Watcher> watcher_;
   scoped_refptr<ConfigReader> config_reader_;
   scoped_refptr<HostsReader> hosts_reader_;