diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 05:45:17 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 05:45:17 +0000 |
commit | e59558b78e8c6a1b0bd916a724724b638c3c91b6 (patch) | |
tree | 712268a7e9e1cd552f309d89641b2bed5ad06322 /net/socket/ssl_client_socket_pool_unittest.cc | |
parent | 31fcd34da3797bc49160620ef8c94a38652c0587 (diff) | |
download | chromium_src-e59558b78e8c6a1b0bd916a724724b638c3c91b6.zip chromium_src-e59558b78e8c6a1b0bd916a724724b638c3c91b6.tar.gz chromium_src-e59558b78e8c6a1b0bd916a724724b638c3c91b6.tar.bz2 |
Rewrite std::string("") to std::string(), Linux edition.
This patch was generated by running the empty_string clang tool
across the Chromium Linux compilation database. Implicitly or
explicitly constructing std::string() with a "" argument is
inefficient as the caller needs to emit extra instructions to
pass an argument, and the constructor needlessly copies a byte
into internal storage. Rewriting these instances to simply call
the default constructor appears to save ~14-18 kilobytes on an
optimized release build.
BUG=none
Review URL: https://codereview.chromium.org/13145003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool_unittest.cc')
-rw-r--r-- | net/socket/ssl_client_socket_pool_unittest.cc | 90 |
1 files changed, 49 insertions, 41 deletions
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index c188a80..fe7e3d2 100644 --- a/net/socket/ssl_client_socket_pool_unittest.cc +++ b/net/socket/ssl_client_socket_pool_unittest.cc @@ -79,46 +79,54 @@ class SSLClientSocketPoolTest : public testing::Test { SSLClientSocketPoolTest() : proxy_service_(ProxyService::CreateDirect()), ssl_config_service_(new SSLConfigServiceDefaults), - http_auth_handler_factory_(HttpAuthHandlerFactory::CreateDefault( - &host_resolver_)), + http_auth_handler_factory_( + HttpAuthHandlerFactory::CreateDefault(&host_resolver_)), session_(CreateNetworkSession()), - direct_transport_socket_params_(new TransportSocketParams( - HostPortPair("host", 443), MEDIUM, false, false, - OnHostResolutionCallback())), + direct_transport_socket_params_( + new TransportSocketParams(HostPortPair("host", 443), + MEDIUM, + false, + false, + OnHostResolutionCallback())), transport_histograms_("MockTCP"), - transport_socket_pool_( - kMaxSockets, - kMaxSocketsPerGroup, - &transport_histograms_, - &socket_factory_), - proxy_transport_socket_params_(new TransportSocketParams( - HostPortPair("proxy", 443), MEDIUM, false, false, - OnHostResolutionCallback())), - socks_socket_params_(new SOCKSSocketParams( - proxy_transport_socket_params_, true, - HostPortPair("sockshost", 443), MEDIUM)), + transport_socket_pool_(kMaxSockets, + kMaxSocketsPerGroup, + &transport_histograms_, + &socket_factory_), + proxy_transport_socket_params_( + new TransportSocketParams(HostPortPair("proxy", 443), + MEDIUM, + false, + false, + OnHostResolutionCallback())), + socks_socket_params_( + new SOCKSSocketParams(proxy_transport_socket_params_, + true, + HostPortPair("sockshost", 443), + MEDIUM)), socks_histograms_("MockSOCKS"), - socks_socket_pool_( - kMaxSockets, - kMaxSocketsPerGroup, - &socks_histograms_, - &transport_socket_pool_), - http_proxy_socket_params_(new HttpProxySocketParams( - proxy_transport_socket_params_, NULL, GURL("http://host"), "", - HostPortPair("host", 80), - session_->http_auth_cache(), - session_->http_auth_handler_factory(), - session_->spdy_session_pool(), - true)), + socks_socket_pool_(kMaxSockets, + kMaxSocketsPerGroup, + &socks_histograms_, + &transport_socket_pool_), + http_proxy_socket_params_( + new HttpProxySocketParams(proxy_transport_socket_params_, + NULL, + GURL("http://host"), + std::string(), + HostPortPair("host", 80), + session_->http_auth_cache(), + session_->http_auth_handler_factory(), + session_->spdy_session_pool(), + true)), http_proxy_histograms_("MockHttpProxy"), - http_proxy_socket_pool_( - kMaxSockets, - kMaxSocketsPerGroup, - &http_proxy_histograms_, - &host_resolver_, - &transport_socket_pool_, - NULL, - NULL) { + http_proxy_socket_pool_(kMaxSockets, + kMaxSocketsPerGroup, + &http_proxy_histograms_, + &host_resolver_, + &transport_socket_pool_, + NULL, + NULL) { scoped_refptr<SSLConfigService> ssl_config_service( new SSLConfigServiceDefaults); ssl_config_service->GetSSLConfig(&ssl_config_); @@ -134,7 +142,7 @@ class SSLClientSocketPoolTest : public testing::Test { NULL /* cert_verifier */, NULL /* server_bound_cert_service */, NULL /* transport_security_state */, - "" /* ssl_session_cache_shard */, + std::string() /* ssl_session_cache_shard */, &socket_factory_, transport_pool ? &transport_socket_pool_ : NULL, socks_pool ? &socks_socket_pool_ : NULL, @@ -722,8 +730,8 @@ TEST_F(SSLClientSocketPoolTest, IPPooling) { host_resolver_.set_synchronous_mode(true); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_hosts); i++) { - host_resolver_.rules()->AddIPLiteralRule(test_hosts[i].name, - test_hosts[i].iplist, ""); + host_resolver_.rules()->AddIPLiteralRule( + test_hosts[i].name, test_hosts[i].iplist, std::string()); // This test requires that the HostResolver cache be populated. Normal // code would have done this already, but we do it manually. @@ -805,8 +813,8 @@ void SSLClientSocketPoolTest::TestIPPoolingDisabled( TestCompletionCallback callback; int rv; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_hosts); i++) { - host_resolver_.rules()->AddIPLiteralRule(test_hosts[i].name, - test_hosts[i].iplist, ""); + host_resolver_.rules()->AddIPLiteralRule( + test_hosts[i].name, test_hosts[i].iplist, std::string()); // This test requires that the HostResolver cache be populated. Normal // code would have done this already, but we do it manually. |