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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/transport_client_socket_pool_unittest.cc

Issue 1376473003: Notify NQE of TCP RTT values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reorder initialization in constructor Created 4 years, 8 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
« no previous file with comments | « net/socket/transport_client_socket_pool_test_util.cc ('k') | net/socket/transport_client_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/transport_client_socket_pool_unittest.cc
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index c8702f70fb242000c3114429c49d545886adb948..c79844a104edfd912ad011dc2275aea5d6df285d 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -39,20 +39,19 @@ class TransportClientSocketPoolTest : public testing::Test {
TransportClientSocketPoolTest()
: connect_backup_jobs_enabled_(
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(true)),
- params_(
- new TransportSocketParams(
- HostPortPair("www.google.com", 80),
- false,
- OnHostResolutionCallback(),
- TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT)),
+ params_(new TransportSocketParams(
+ HostPortPair("www.google.com", 80),
+ false,
+ OnHostResolutionCallback(),
+ TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT)),
host_resolver_(new MockHostResolver),
client_socket_factory_(&net_log_),
pool_(kMaxSockets,
kMaxSocketsPerGroup,
host_resolver_.get(),
&client_socket_factory_,
- NULL) {
- }
+ NULL,
+ NULL) {}
~TransportClientSocketPoolTest() override {
internal::ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(
@@ -855,11 +854,9 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketFailAfterDelay) {
TEST_F(TransportClientSocketPoolTest, IPv6FallbackSocketIPv4FinishesFirst) {
// Create a pool without backup jobs.
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
- TransportClientSocketPool pool(kMaxSockets,
- kMaxSocketsPerGroup,
- host_resolver_.get(),
- &client_socket_factory_,
- NULL);
+ TransportClientSocketPool pool(kMaxSockets, kMaxSocketsPerGroup,
+ host_resolver_.get(), &client_socket_factory_,
+ NULL, NULL);
MockTransportClientSocketFactory::ClientSocketType case_types[] = {
// This is the IPv6 socket. It stalls, but presents one failed connection
@@ -906,11 +903,9 @@ TEST_F(TransportClientSocketPoolTest, IPv6FallbackSocketIPv4FinishesFirst) {
TEST_F(TransportClientSocketPoolTest, IPv6FallbackSocketIPv6FinishesFirst) {
// Create a pool without backup jobs.
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
- TransportClientSocketPool pool(kMaxSockets,
- kMaxSocketsPerGroup,
- host_resolver_.get(),
- &client_socket_factory_,
- NULL);
+ TransportClientSocketPool pool(kMaxSockets, kMaxSocketsPerGroup,
+ host_resolver_.get(), &client_socket_factory_,
+ NULL, NULL);
MockTransportClientSocketFactory::ClientSocketType case_types[] = {
// This is the IPv6 socket.
@@ -957,11 +952,9 @@ TEST_F(TransportClientSocketPoolTest, IPv6FallbackSocketIPv6FinishesFirst) {
TEST_F(TransportClientSocketPoolTest, IPv6NoIPv4AddressesToFallbackTo) {
// Create a pool without backup jobs.
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
- TransportClientSocketPool pool(kMaxSockets,
- kMaxSocketsPerGroup,
- host_resolver_.get(),
- &client_socket_factory_,
- NULL);
+ TransportClientSocketPool pool(kMaxSockets, kMaxSocketsPerGroup,
+ host_resolver_.get(), &client_socket_factory_,
+ NULL, NULL);
client_socket_factory_.set_default_client_socket_type(
MockTransportClientSocketFactory::MOCK_DELAYED_CLIENT_SOCKET);
@@ -992,11 +985,9 @@ TEST_F(TransportClientSocketPoolTest, IPv6NoIPv4AddressesToFallbackTo) {
TEST_F(TransportClientSocketPoolTest, IPv4HasNoFallback) {
// Create a pool without backup jobs.
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
- TransportClientSocketPool pool(kMaxSockets,
- kMaxSocketsPerGroup,
- host_resolver_.get(),
- &client_socket_factory_,
- NULL);
+ TransportClientSocketPool pool(kMaxSockets, kMaxSocketsPerGroup,
+ host_resolver_.get(), &client_socket_factory_,
+ NULL, NULL);
client_socket_factory_.set_default_client_socket_type(
MockTransportClientSocketFactory::MOCK_DELAYED_CLIENT_SOCKET);
@@ -1031,11 +1022,8 @@ TEST_F(TransportClientSocketPoolTest, TCPFastOpenOnIPv4WithNoFallback) {
factory.AddSocketDataProvider(&socket_data);
// Create a pool without backup jobs.
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
- TransportClientSocketPool pool(kMaxSockets,
- kMaxSocketsPerGroup,
- host_resolver_.get(),
- &factory,
- NULL);
+ TransportClientSocketPool pool(kMaxSockets, kMaxSocketsPerGroup,
+ host_resolver_.get(), &factory, NULL, NULL);
// Resolve an AddressList with only IPv4 addresses.
host_resolver_->rules()->AddIPLiteralRule("*", "1.1.1.1", std::string());
@@ -1057,11 +1045,8 @@ TEST_F(TransportClientSocketPoolTest, TCPFastOpenOnIPv6WithNoFallback) {
factory.AddSocketDataProvider(&socket_data);
// Create a pool without backup jobs.
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
- TransportClientSocketPool pool(kMaxSockets,
- kMaxSocketsPerGroup,
- host_resolver_.get(),
- &factory,
- NULL);
+ TransportClientSocketPool pool(kMaxSockets, kMaxSocketsPerGroup,
+ host_resolver_.get(), &factory, NULL, NULL);
client_socket_factory_.set_default_client_socket_type(
MockTransportClientSocketFactory::MOCK_DELAYED_CLIENT_SOCKET);
// Resolve an AddressList with only IPv6 addresses.
@@ -1091,11 +1076,8 @@ TEST_F(TransportClientSocketPoolTest,
factory.AddSocketDataProvider(&socket_data_2);
// Create a pool without backup jobs.
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
- TransportClientSocketPool pool(kMaxSockets,
- kMaxSocketsPerGroup,
- host_resolver_.get(),
- &factory,
- NULL);
+ TransportClientSocketPool pool(kMaxSockets, kMaxSocketsPerGroup,
+ host_resolver_.get(), &factory, NULL, NULL);
// Resolve an AddressList with a IPv6 address first and then a IPv4 address.
host_resolver_->rules()
@@ -1126,11 +1108,8 @@ TEST_F(TransportClientSocketPoolTest,
factory.AddSocketDataProvider(&socket_data);
// Create a pool without backup jobs.
ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
- TransportClientSocketPool pool(kMaxSockets,
- kMaxSocketsPerGroup,
- host_resolver_.get(),
- &factory,
- NULL);
+ TransportClientSocketPool pool(kMaxSockets, kMaxSocketsPerGroup,
+ host_resolver_.get(), &factory, NULL, NULL);
// Resolve an AddressList with a IPv6 address first and then a IPv4 address.
host_resolver_->rules()
« no previous file with comments | « net/socket/transport_client_socket_pool_test_util.cc ('k') | net/socket/transport_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698