[net] Move DnsConfigService to NetworkChangeNotifier.

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>
 #include <iphlpapi.h>
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #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
 // |search| in DnsConfig. The settings are stored in the Windows registry, but
 // to simplify the task we use the IP Helper API wherever possible. That API
 // yields the complete and ordered |nameservers|, but to determine |search| we
 // need to use the registry. On Windows 7, WMI does return the correct |search|
 // but on earlier versions it is insufficient.
 //
 // Experimental evaluation of Windows behavior suggests that domain parsing is
@@ skipping 92 matching lines @@
     DnsConfig* dns_config);
 
 // Use DnsConfigService::CreateSystemService to use it outside of tests.
 class NET_EXPORT_PRIVATE DnsConfigServiceWin
     : public DnsConfigService,
       public NetworkChangeNotifier::IPAddressObserver {
  public:
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(DnsConfigServiceWin);
 };
 
 }  // namespace internal
 
 }  // namespace net
 
 #endif  // NET_DNS_DNS_CONFIG_SERVICE_WIN_H_