Net: Convert username and password to string16.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3040016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54101 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 12 deletions

diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 0d75516..8ff6ace 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -920,8 +920,8 @@ int MockHttpAuthController::HandleAuthChallenge(
   return OK;
 }
 
-void MockHttpAuthController::ResetAuth(const std::wstring& username,
-                                       const std::wstring& password) {
+void MockHttpAuthController::ResetAuth(const string16& username,
+                                       const string16& password) {
   data_index_++;
 }
 
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index d2dd31a..1a0ab11 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -16,6 +16,7 @@
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
+#include "base/string16.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ -636,8 +637,8 @@ class MockTCPClientSocketPool : public TCPClientSocketPool {
       const scoped_refptr<ClientSocketPoolHistograms>& histograms,
       ClientSocketFactory* socket_factory);
 
-  int release_count() const { return release_count_; };
-  int cancel_count() const { return cancel_count_; };
+  int release_count() const { return release_count_; }
+  int cancel_count() const { return cancel_count_; }
 
   // TCPClientSocketPool methods.
   virtual int RequestSocket(const std::string& group_name,
@@ -695,7 +696,8 @@ class MockSOCKSClientSocketPool : public SOCKSClientSocketPool {
 };
 
 struct MockHttpAuthControllerData {
-  MockHttpAuthControllerData(std::string header) : auth_header(header) {}
+  explicit MockHttpAuthControllerData(std::string header)
+      : auth_header(header) {}
 
   std::string auth_header;
 };
@@ -716,8 +718,8 @@ class MockHttpAuthController : public HttpAuthController {
                                   bool do_not_send_server_auth,
                                   bool establishing_tunnel,
                                   const BoundNetLog& net_log);
-  virtual void ResetAuth(const std::wstring& username,
-                         const std::wstring& password);
+  virtual void ResetAuth(const string16& username,
+                         const string16& password);
   virtual bool HaveAuthHandler() const;
   virtual bool HaveAuth() const;
 
diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc
index 64cae4c..d8b6339 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -77,7 +77,6 @@ class SSLClientSocketPoolTest : public ClientSocketPoolTest {
   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 @@ TEST_F(SSLClientSocketPoolTest, DoProxyAuth) {
   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 @@ TEST_F(SSLClientSocketPoolTest, DoProxyAuthNoKeepAlive) {
   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());