diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 21:32:18 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 21:32:18 +0000 |
| commit | 926ee619c499ee862e72b073643a41f2a3681457 (patch) | |
| tree | 4af6944b8df99a1f037c958ebc5c39a5fc9a2a6d /net/url_request | |
| parent | 996e8774368c573e67a8ee0de9c8362a8d65d37e (diff) | |
| download | chromium_src-926ee619c499ee862e72b073643a41f2a3681457.zip chromium_src-926ee619c499ee862e72b073643a41f2a3681457.tar.gz chromium_src-926ee619c499ee862e72b073643a41f2a3681457.tar.bz2 | |
Revert "Make TCPClientSocketPool own the ConnectingSockets."
This reverts r18414.
Broke reliability bot.
Review URL: http://codereview.chromium.org/128001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 17 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.h | 5 |
2 files changed, 16 insertions, 6 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 18ff111..3af95e2 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -45,7 +45,10 @@ namespace { class URLRequestHttpCacheContext : public URLRequestContext { public: URLRequestHttpCacheContext() { - 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); proxy_service_ = net::ProxyService::CreateNull(); http_transaction_factory_ = new net::HttpCache( @@ -315,7 +318,8 @@ TEST_F(HTTPSRequestTest, MAYBE_HTTPSExpiredTest) { } } -TEST_F(URLRequestTest, CancelTest) { +// http://crbug.com/13952 +TEST_F(URLRequestTest, DISABLED_CancelTest) { TestDelegate d; { TestURLRequest r(GURL("http://www.google.com/"), &d); @@ -338,7 +342,8 @@ TEST_F(URLRequestTest, CancelTest) { #endif } -TEST_F(URLRequestTest, CancelTest2) { +// http://crbug.com/13952 +TEST_F(URLRequestTest, DISABLED_CancelTest2) { scoped_refptr<HTTPTestServer> server = HTTPTestServer::CreateServer(L"", NULL); ASSERT_TRUE(NULL != server.get()); @@ -367,7 +372,8 @@ TEST_F(URLRequestTest, CancelTest2) { #endif } -TEST_F(URLRequestTest, CancelTest3) { +// http://crbug.com/13952 +TEST_F(URLRequestTest, DISABLED_CancelTest3) { scoped_refptr<HTTPTestServer> server = HTTPTestServer::CreateServer(L"", NULL); ASSERT_TRUE(NULL != server.get()); @@ -395,7 +401,8 @@ TEST_F(URLRequestTest, CancelTest3) { #endif } -TEST_F(URLRequestTest, CancelTest4) { +// http://crbug.com/13952 +TEST_F(URLRequestTest, DISABLED_CancelTest4) { scoped_refptr<HTTPTestServer> server = HTTPTestServer::CreateServer(L"", NULL); ASSERT_TRUE(NULL != server.get()); diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h index eddb51d..fa676f8 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -43,7 +43,10 @@ using base::TimeDelta; class TestURLRequestContext : public URLRequestContext { public: TestURLRequestContext() { - 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); proxy_service_ = net::ProxyService::CreateNull(); http_transaction_factory_ = net::HttpNetworkLayer::CreateFactory(host_resolver_, |