[net] Move DnsConfigService to NetworkChangeNotifier.

net/base/host_resolver_impl.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_BASE_HOST_RESOLVER_IMPL_H_
 #define NET_BASE_HOST_RESOLVER_IMPL_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/host_cache.h"
 #include "net/base/host_resolver.h"
 #include "net/base/host_resolver_proc.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/prioritized_dispatcher.h"
 
 namespace net {
 
 class BoundNetLog;
 class DnsClient;
-struct DnsConfig;
-class DnsConfigService;
 class NetLog;
 
 // For each hostname that is requested, HostResolver creates a
 // HostResolverImpl::Job. When this job gets dispatched it creates a ProcTask
 // which runs the given HostResolverProc on a WorkerPool thread. If requests for
 // that same host are made during the job's lifetime, they are attached to the
 // existing job rather than creating a new one. This avoids doing parallel
 // resolves for the same host.
 //
 // The way these classes fit together is illustrated by:
@@ skipping 14 matching lines @@
 // from one thread!
 //
 // The HostResolverImpl enforces limits on the maximum number of concurrent
 // threads using PrioritizedDispatcher::Limits.
 //
 // Jobs are ordered in the queue based on their priority and order of arrival.
 class NET_EXPORT HostResolverImpl
     : public HostResolver,
       NON_EXPORTED_BASE(public base::NonThreadSafe),
       public NetworkChangeNotifier::IPAddressObserver,
+      public NetworkChangeNotifier::DNSObserver,
       public base::SupportsWeakPtr<HostResolverImpl> {
  public:
   // Parameters for ProcTask which resolves hostnames using HostResolveProc.
   //
   // |resolver_proc| is used to perform the actual resolves; it must be
   // thread-safe since it is run from multiple worker threads. If
   // |resolver_proc| is NULL then the default host resolver procedure is
   // used (which is SystemHostResolverProc except if overridden).
   //
   // For each attempt, we could start another attempt if host is not resolved
@@ skipping 38 matching lines @@
   // |dns_config_service| will be used to detect changes to DNS configuration
   // and obtain DnsConfig for DnsClient.
   //
   // |dns_client|, if set, will be used to resolve requests.
   //
   // |net_log| must remain valid for the life of the HostResolverImpl.
   // TODO(szym): change to scoped_ptr<HostCache>.
   HostResolverImpl(HostCache* cache,
                    const PrioritizedDispatcher::Limits& job_limits,
                    const ProcTaskParams& proc_params,
-                   scoped_ptr<DnsConfigService> dns_config_service,
                    scoped_ptr<DnsClient> dns_client,
                    NetLog* net_log);
 
   // If any completion callbacks are pending when the resolver is destroyed,
   // the host resolutions are cancelled, and the completion callbacks will not
   // be called.
   virtual ~HostResolverImpl();
 
   // Configures maximum number of Jobs in the queue. Exposed for testing.
   // Only allowed when the queue is empty.
@@ skipping 80 matching lines @@
   // Might start new jobs.
   void AbortAllInProgressJobs();
 
   // Attempts to serve each Job in |jobs_| from the HOSTS file if we have
   // a DnsClient with a valid DnsConfig.
   void TryServingAllJobsFromHosts();
 
   // NetworkChangeNotifier::IPAddressObserver:
   virtual void OnIPAddressChanged() OVERRIDE;
 
-  // DnsConfigService callback:
-  void OnDnsConfigChanged(const DnsConfig& dns_config);
+  // NetworkChangeNotifier::DNSObserver:
+  virtual void OnDNSChanged() OVERRIDE;
 
   // True if have a DnsClient with a valid DnsConfig.
   bool HaveDnsConfig() const;
 
   // Allows the tests to catch slots leaking out of the dispatcher.
   size_t num_running_jobs_for_tests() const {
     return dispatcher_.num_running_jobs();
   }
 
   // Cache of host resolution results.
   scoped_ptr<HostCache> cache_;
 
   // Map from HostCache::Key to a Job.
   JobMap jobs_;
 
   // Starts Jobs according to their priority and the configured limits.
   PrioritizedDispatcher dispatcher_;
 
   // Limit on the maximum number of jobs queued in |dispatcher_|.
   size_t max_queued_jobs_;
 
   // Parameters for ProcTask.
   ProcTaskParams proc_params_;
 
   // Address family to use when the request doesn't specify one.
   AddressFamily default_address_family_;
 
-  scoped_ptr<DnsConfigService> dns_config_service_;
-
   // If present, used by DnsTask and ServeFromHosts to resolve requests.
   scoped_ptr<DnsClient> dns_client_;
 
   // True if received valid config from |dns_config_service_|. Temporary, used
   // to measure performance of DnsConfigService: http://crbug.com/125599
   bool received_dns_config_;
 
   // Indicate if probing is done after each network change event to set address
   // family. When false, explicit setting of address family is used.
   bool ipv6_probe_monitoring_;
 
   // The last un-cancelled IPv6ProbeJob (if any).
   scoped_refptr<IPv6ProbeJob> ipv6_probe_job_;
 
   // Any resolver flags that should be added to a request by default.
   HostResolverFlags additional_resolver_flags_;
 
   NetLog* net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(HostResolverImpl);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_HOST_RESOLVER_IMPL_H_