Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: net/base/tcp_client_socket_pool_unittest.cc

Issue 118100: Avoid doing concurrent DNS resolves of the same hostname (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Get compiling on mac Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/tcp_client_socket_pool_unittest.cc
===================================================================
--- net/base/tcp_client_socket_pool_unittest.cc (revision 18213)
+++ net/base/tcp_client_socket_pool_unittest.cc (working copy)
@@ -198,13 +198,19 @@
class TCPClientSocketPoolTest : public testing::Test {
protected:
TCPClientSocketPoolTest()
- : pool_(new TCPClientSocketPool(kMaxSocketsPerGroup,
+ // We disable caching here since these unit tests don't expect
+ // host resolving to be able to complete synchronously.
+ // TODO(eroman): enable caching.
+ : host_resolver_(0, 0),
+ pool_(new TCPClientSocketPool(kMaxSocketsPerGroup,
+ &host_resolver_,
&client_socket_factory_)) {}
virtual void SetUp() {
TestSocketRequest::completion_count = 0;
}
+ HostResolver host_resolver_;
MockClientSocketFactory client_socket_factory_;
scoped_refptr<ClientSocketPool> pool_;
std::vector<TestSocketRequest*> request_order_;

Powered by Google App Engine
This is Rietveld 408576698