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

Unified Diff: net/http/http_proxy_client_socket_pool_spdy2_unittest.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 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
Index: net/http/http_proxy_client_socket_pool_spdy2_unittest.cc
diff --git a/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc b/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc
index 77ccbedfa7c12c71cbf4e53d2035d7a6add51fdc..48ac42ca5f9aa6d33c8666df99328d255addf4b1 100644
--- a/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc
@@ -47,26 +47,37 @@ class HttpProxyClientSocketPoolSpdy2Test : public TestWithHttpParam {
protected:
HttpProxyClientSocketPoolSpdy2Test()
: ssl_config_(),
- ignored_transport_socket_params_(new TransportSocketParams(
- HostPortPair("proxy", 80), LOWEST, false, false,
- OnHostResolutionCallback())),
- ignored_ssl_socket_params_(new SSLSocketParams(
- ignored_transport_socket_params_, NULL, NULL,
- ProxyServer::SCHEME_DIRECT, HostPortPair("www.google.com", 443),
- ssl_config_, 0, false, false)),
+ ignored_transport_socket_params_(
+ new TransportSocketParams(HostPortPair("proxy", 80),
+ LOWEST,
+ false,
+ false,
+ OnHostResolutionCallback())),
+ ignored_ssl_socket_params_(
+ new SSLSocketParams(ignored_transport_socket_params_,
+ NULL,
+ NULL,
+ ProxyServer::SCHEME_DIRECT,
+ HostPortPair("www.google.com", 443),
+ ssl_config_,
+ 0,
+ false,
+ false)),
tcp_histograms_("MockTCP"),
transport_socket_pool_(
- kMaxSockets, kMaxSocketsPerGroup,
+ kMaxSockets,
+ kMaxSocketsPerGroup,
&tcp_histograms_,
session_deps_.deterministic_socket_factory.get()),
ssl_histograms_("MockSSL"),
- ssl_socket_pool_(kMaxSockets, kMaxSocketsPerGroup,
+ ssl_socket_pool_(kMaxSockets,
+ kMaxSocketsPerGroup,
&ssl_histograms_,
session_deps_.host_resolver.get(),
session_deps_.cert_verifier.get(),
NULL /* server_bound_cert_store */,
NULL /* transport_security_state */,
- "" /* ssl_session_cache_shard */,
+ std::string() /* ssl_session_cache_shard */,
session_deps_.deterministic_socket_factory.get(),
&transport_socket_pool_,
NULL,
@@ -77,13 +88,13 @@ class HttpProxyClientSocketPoolSpdy2Test : public TestWithHttpParam {
http_proxy_histograms_("HttpProxyUnitTest"),
ssl_data_(NULL),
data_(NULL),
- pool_(kMaxSockets, kMaxSocketsPerGroup,
+ pool_(kMaxSockets,
+ kMaxSocketsPerGroup,
&http_proxy_histograms_,
NULL,
&transport_socket_pool_,
&ssl_socket_pool_,
- NULL) {
- }
+ NULL) {}
virtual ~HttpProxyClientSocketPoolSpdy2Test() {
}
@@ -115,17 +126,16 @@ class HttpProxyClientSocketPoolSpdy2Test : public TestWithHttpParam {
// Returns the a correctly constructed HttpProxyParms
// for the HTTP or HTTPS proxy.
scoped_refptr<HttpProxySocketParams> GetParams(bool tunnel) {
- return scoped_refptr<HttpProxySocketParams>(
- new HttpProxySocketParams(
- GetTcpParams(),
- GetSslParams(),
- GURL(tunnel ? "https://www.google.com/" : "http://www.google.com"),
- "",
- HostPortPair("www.google.com", tunnel ? 443 : 80),
- session_->http_auth_cache(),
- session_->http_auth_handler_factory(),
- session_->spdy_session_pool(),
- tunnel));
+ return scoped_refptr<HttpProxySocketParams>(new HttpProxySocketParams(
+ GetTcpParams(),
+ GetSslParams(),
+ GURL(tunnel ? "https://www.google.com/" : "http://www.google.com"),
+ std::string(),
+ HostPortPair("www.google.com", tunnel ? 443 : 80),
+ session_->http_auth_cache(),
+ session_->http_auth_handler_factory(),
+ session_->spdy_session_pool(),
+ tunnel));
}
scoped_refptr<HttpProxySocketParams> GetTunnelParams() {
« no previous file with comments | « net/http/http_network_transaction_spdy3_unittest.cc ('k') | net/http/http_proxy_client_socket_pool_spdy3_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698