Remove the HostResolver::Shutdown() method.

While this doesn't entirely remove the hack, it limits the scope of it to HostResolverImpl.
Hopefully in the future HostResolver will not be refcounted so this can go away altogether.

BUG=18373

Review URL: http://codereview.chromium.org/569035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38243 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 4 insertions, 15 deletions

diff --git a/net/base/fixed_host_resolver.h b/net/base/fixed_host_resolver.h
index b5e4a72..ee7b114 100644
--- a/net/base/fixed_host_resolver.h
+++ b/net/base/fixed_host_resolver.h
@@ -28,7 +28,6 @@ class FixedHostResolver : public HostResolver {
   virtual void CancelRequest(RequestHandle req) {}
   virtual void AddObserver(Observer* observer) {}
   virtual void RemoveObserver(Observer* observer) {}
-  virtual void Shutdown() {}
 
  private:
   ~FixedHostResolver() {}
diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h
index 32706a0..298f79a 100644
--- a/net/base/host_resolver.h
+++ b/net/base/host_resolver.h
@@ -148,9 +148,6 @@ class HostResolver : public base::RefCountedThreadSafe<HostResolver> {
   // Unregisters an observer previously added by AddObserver().
   virtual void RemoveObserver(Observer* observer) = 0;
 
-  // TODO(eroman): temp hack for http://crbug.com/18373
-  virtual void Shutdown() = 0;
-
   // Sets the default AddressFamily to use when requests have left it
   // unspecified. For example, this could be used to restrict resolution
   // results to AF_INET by passing in ADDRESS_FAMILY_IPV4, or to
diff --git a/net/base/host_resolver_impl.h b/net/base/host_resolver_impl.h
index be7f741..6499b3e 100644
--- a/net/base/host_resolver_impl.h
+++ b/net/base/host_resolver_impl.h
@@ -88,15 +88,15 @@ class HostResolverImpl : public HostResolver,
   virtual void AddObserver(HostResolver::Observer* observer);
   virtual void RemoveObserver(HostResolver::Observer* observer);
 
-  // TODO(eroman): temp hack for http://crbug.com/15513
-  virtual void Shutdown();
-
   virtual void SetDefaultAddressFamily(AddressFamily address_family) {
     default_address_family_ = address_family;
   }
 
   virtual bool IsHostResolverImpl() { return true; }
 
+  // TODO(eroman): hack for http://crbug.com/15513
+  void Shutdown();
+
   // Returns the cache this resolver uses, or NULL if caching is disabled.
   HostCache* cache() { return cache_.get(); }
 
@@ -239,7 +239,7 @@ class HostResolverImpl : public HostResolver,
   // Address family to use when the request doesn't specify one.
   AddressFamily default_address_family_;
 
-  // TODO(eroman): temp hack for http://crbug.com/15513
+  // TODO(eroman): hack for http://crbug.com/15513
   bool shutdown_;
 
   NetworkChangeNotifier* const network_change_notifier_;
diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
index 2185182..9a2c916 100644
--- a/net/base/mock_host_resolver.cc
+++ b/net/base/mock_host_resolver.cc
@@ -66,10 +66,6 @@ void MockHostResolverBase::RemoveObserver(Observer* observer) {
   impl_->RemoveObserver(observer);
 }
 
-void MockHostResolverBase::Shutdown() {
-  impl_->Shutdown();
-}
-
 void MockHostResolverBase::Reset(HostResolverProc* interceptor) {
   synchronous_mode_ = false;
 
diff --git a/net/base/mock_host_resolver.h b/net/base/mock_host_resolver.h
index 8c843b60..c1f93f5 100644
--- a/net/base/mock_host_resolver.h
+++ b/net/base/mock_host_resolver.h
@@ -47,8 +47,6 @@ class MockHostResolverBase : public HostResolver {
   virtual void CancelRequest(RequestHandle req);
   virtual void AddObserver(Observer* observer);
   virtual void RemoveObserver(Observer* observer);
-  // TODO(eroman): temp hack for http://crbug.com/18373
-  virtual void Shutdown();
 
   RuleBasedHostResolverProc* rules() { return rules_; }
 
diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc
index bbd6f0f..b3bb11a 100644
--- a/net/socket/socks_client_socket_unittest.cc
+++ b/net/socket/socks_client_socket_unittest.cc
@@ -103,7 +103,6 @@ class HangingHostResolver : public HostResolver {
 
   virtual void AddObserver(Observer* observer) {}
   virtual void RemoveObserver(Observer* observer) {}
-  virtual void Shutdown() {}
 
   bool HasOutstandingRequest() {
     return outstanding_request_ != NULL;