Flush socket pools and SPDY session pool properly on explicit requests and network changes.

net/base/host_resolver_impl.h

 // Copyright (c) 2006-2008 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 <string>
 #include <vector>
 
@@ skipping 29 matching lines @@
 // callbacks of each waiting request are run on the origin thread.
 //
 // Thread safety: This class is not threadsafe, and must only be called
 // from one thread!
 //
 // The HostResolverImpl enforces |max_jobs_| as the maximum number of concurrent
 // threads.
 //
 // Requests are ordered in the queue based on their priority.
 
-class HostResolverImpl : public HostResolver,
-                         public NetworkChangeNotifier::Observer {
+class HostResolverImpl : public HostResolver {
  public:
   // The index into |job_pools_| for the various job pools. Pools with a higher
   // index have lower priority.
   //
   // Note: This is currently unused, since there is a single pool
   //       for all requests.
   enum JobPoolIndex {
     POOL_NORMAL = 0,
     POOL_COUNT,
   };
@@ skipping 19 matching lines @@
 
   // HostResolver methods:
   virtual int Resolve(const RequestInfo& info,
                       AddressList* addresses,
                       CompletionCallback* callback,
                       RequestHandle* out_req,
                       const BoundNetLog& net_log);
   virtual void CancelRequest(RequestHandle req);
   virtual void AddObserver(HostResolver::Observer* observer);
   virtual void RemoveObserver(HostResolver::Observer* observer);
+  virtual void Flush();
 
   // Set address family, and disable IPv6 probe support.
   virtual void SetDefaultAddressFamily(AddressFamily address_family);
 
   // Continuously observe whether IPv6 is supported, and set the allowable
   // address family to IPv4 iff IPv6 is not supported.
   void ProbeIPv6Support();
 
   virtual HostResolverImpl* GetAsHostResolverImpl() { return this; }
 
@@ skipping 72 matching lines @@
   void OnFinishRequest(const BoundNetLog& net_log,
                        int request_id,
                        const RequestInfo& info,
                        int error);
 
   // Called when a request has been cancelled.
   void OnCancelRequest(const BoundNetLog& net_log,
                        int request_id,
                        const RequestInfo& info);
 
-  // NetworkChangeNotifier::Observer methods:
-  virtual void OnIPAddressChanged();
-
   // Notify IPv6ProbeJob not to call back, and discard reference to the job.
   void DiscardIPv6ProbeJob();
 
   // Callback from IPv6 probe activity.
   void IPv6ProbeSetDefaultAddressFamily(AddressFamily address_family);
 
   // Returns true if the constraints for |pool| are met, and a new job can be
   // created for this pool.
   bool CanCreateJobForPool(const JobPool& pool) const;
 
@@ skipping 68 matching lines @@
 
   // The last un-cancelled IPv6ProbeJob (if any).
   scoped_refptr<IPv6ProbeJob> ipv6_probe_job_;
 
   DISALLOW_COPY_AND_ASSIGN(HostResolverImpl);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_HOST_RESOLVER_IMPL_H_