Reverting 19425.

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

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

3 files changed, 8 insertions, 3 deletions

diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index 486ade0..374af90 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -13,13 +13,13 @@
 #include "base/ref_counted.h"
 #include "base/string_util.h"
 #include "net/base/cookie_policy.h"
-#include "net/base/host_resolver.h"
 #include "net/ftp/ftp_auth_cache.h"
 
 namespace net {
 class CookieMonster;
 class ForceTLSState;
 class FtpTransactionFactory;
+class HostResolver;
 class HttpTransactionFactory;
 class ProxyService;
 }
@@ -113,7 +113,7 @@ class URLRequestContext :
 
   // The following members are expected to be initialized and owned by
   // subclasses.
-  scoped_refptr<net::HostResolver> host_resolver_;
+  net::HostResolver* host_resolver_;
   net::ProxyService* proxy_service_;
   net::HttpTransactionFactory* http_transaction_factory_;
   net::FtpTransactionFactory* ftp_transaction_factory_;
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 415fb1c..f5452be 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -59,6 +59,7 @@ class URLRequestHttpCacheContext : public URLRequestContext {
     delete cookie_store_;
     delete http_transaction_factory_;
     delete proxy_service_;
+    delete host_resolver_;
   }
 };
 
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index dcc1757..a4ec2fe 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -51,7 +51,10 @@ class TestURLRequestContext : public URLRequestContext {
   }
 
   explicit TestURLRequestContext(const std::string& proxy) {
-    host_resolver_ = new net::HostResolver;
+    // TODO(eroman): we turn off host caching to see if synchronous
+    // host resolving interacts poorly with client socket pool. [experiment]
+    // http://crbug.com/13952
+    host_resolver_ = new net::HostResolver(0, 0);
     net::ProxyConfig proxy_config;
     proxy_config.proxy_rules.ParseFromString(proxy);
     proxy_service_ = net::ProxyService::CreateFixed(proxy_config);
@@ -63,6 +66,7 @@ class TestURLRequestContext : public URLRequestContext {
   virtual ~TestURLRequestContext() {
     delete http_transaction_factory_;
     delete proxy_service_;
+    delete host_resolver_;
   }
 };