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

Unified Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 3040016: Net: Convert username and password to string16. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: address comments Created 10 years, 5 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/socket_test_util.cc ('k') | net/socket_stream/socket_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool_unittest.cc
===================================================================
--- net/socket/ssl_client_socket_pool_unittest.cc (revision 53997)
+++ net/socket/ssl_client_socket_pool_unittest.cc (working copy)
@@ -77,7 +77,6 @@
scoped_refptr<SSLSocketParams> SSLParams(
ProxyServer::Scheme proxy, struct MockHttpAuthControllerData* auth_data,
size_t auth_data_len, bool want_spdy_over_ssl, bool want_spdy_over_npn) {
-
scoped_refptr<HttpProxySocketParams> http_proxy_params;
if (proxy == ProxyServer::SCHEME_HTTP) {
scoped_refptr<MockHttpAuthController> auth_controller =
@@ -641,8 +640,8 @@
const HttpResponseInfo& tunnel_info = handle.ssl_error_response_info();
EXPECT_EQ(tunnel_info.headers->response_code(), 407);
- params->http_proxy_params()->auth_controller()->ResetAuth(std::wstring(),
- std::wstring());
+ params->http_proxy_params()->auth_controller()->ResetAuth(string16(),
+ string16());
rv = handle.Init("a", params, MEDIUM, &callback, pool_, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
@@ -710,8 +709,8 @@
const HttpResponseInfo& tunnel_info = handle.ssl_error_response_info();
EXPECT_EQ(tunnel_info.headers->response_code(), 407);
- params->http_proxy_params()->auth_controller()->ResetAuth(std::wstring(),
- std::wstring());
+ params->http_proxy_params()->auth_controller()->ResetAuth(string16(),
+ string16());
rv = handle.Init("a", params, MEDIUM, &callback, pool_, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
EXPECT_FALSE(handle.is_initialized());
« no previous file with comments | « net/socket/socket_test_util.cc ('k') | net/socket_stream/socket_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698