diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 18:57:48 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-15 18:57:48 +0000 |
| commit | 94486c00c7ee5ed1e9e4cb28f27ed447ffe20e96 (patch) | |
| tree | 41f9fb0a0a88caa2fc73eba88c95253f374fc2da /net/url_request | |
| parent | 1df8d42d4d36358480f3a9c86e22d43a3da36c53 (diff) | |
| download | chromium_src-94486c00c7ee5ed1e9e4cb28f27ed447ffe20e96.zip chromium_src-94486c00c7ee5ed1e9e4cb28f27ed447ffe20e96.tar.gz chromium_src-94486c00c7ee5ed1e9e4cb28f27ed447ffe20e96.tar.bz2 | |
Make TCPClientSocketPool own the ConnectingSockets.
Re-enable the disabled URLRequest tests.
BUG=http://crbug.com/13952
TEST=covered by existing tests
Review URL: http://codereview.chromium.org/126065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18414 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, 6 insertions, 16 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 3af95e2..18ff111 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -45,10 +45,7 @@ namespace { class URLRequestHttpCacheContext : public URLRequestContext { public: URLRequestHttpCacheContext() { - // 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); + host_resolver_ = new net::HostResolver; proxy_service_ = net::ProxyService::CreateNull(); http_transaction_factory_ = new net::HttpCache( @@ -318,8 +315,7 @@ TEST_F(HTTPSRequestTest, MAYBE_HTTPSExpiredTest) { } } -// http://crbug.com/13952 -TEST_F(URLRequestTest, DISABLED_CancelTest) { +TEST_F(URLRequestTest, CancelTest) { TestDelegate d; { TestURLRequest r(GURL("http://www.google.com/"), &d); @@ -342,8 +338,7 @@ TEST_F(URLRequestTest, DISABLED_CancelTest) { #endif } -// http://crbug.com/13952 -TEST_F(URLRequestTest, DISABLED_CancelTest2) { +TEST_F(URLRequestTest, CancelTest2) { scoped_refptr<HTTPTestServer> server = HTTPTestServer::CreateServer(L"", NULL); ASSERT_TRUE(NULL != server.get()); @@ -372,8 +367,7 @@ TEST_F(URLRequestTest, DISABLED_CancelTest2) { #endif } -// http://crbug.com/13952 -TEST_F(URLRequestTest, DISABLED_CancelTest3) { +TEST_F(URLRequestTest, CancelTest3) { scoped_refptr<HTTPTestServer> server = HTTPTestServer::CreateServer(L"", NULL); ASSERT_TRUE(NULL != server.get()); @@ -401,8 +395,7 @@ TEST_F(URLRequestTest, DISABLED_CancelTest3) { #endif } -// http://crbug.com/13952 -TEST_F(URLRequestTest, DISABLED_CancelTest4) { +TEST_F(URLRequestTest, 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 fa676f8..eddb51d 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -43,10 +43,7 @@ using base::TimeDelta; class TestURLRequestContext : public URLRequestContext { public: TestURLRequestContext() { - // 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); + host_resolver_ = new net::HostResolver; proxy_service_ = net::ProxyService::CreateNull(); http_transaction_factory_ = net::HttpNetworkLayer::CreateFactory(host_resolver_, |