From 13c8a0903376ff406151679d8673a6452d721290 Mon Sep 17 00:00:00 2001
From: "thestig@chromium.org"
 <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 29 Jul 2010 06:15:44 +0000
Subject: 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
---
 net/http/http_auth_cache.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'net/http/http_auth_cache.h')

diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h
index 297457d..dc82107 100644
--- a/net/http/http_auth_cache.h
+++ b/net/http/http_auth_cache.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/ref_counted.h"
+#include "base/string16.h"
 #include "googleurl/src/gurl.h"
 // This is needed for the FRIEND_TEST() macro.
 #include "testing/gtest/include/gtest/gtest_prod.h"
@@ -62,8 +63,8 @@ class HttpAuthCache {
              const std::string& realm,
              const std::string& scheme,
              const std::string& auth_challenge,
-             const std::wstring& username,
-             const std::wstring& password,
+             const string16& username,
+             const string16& password,
              const std::string& path);
 
   // Remove entry on server |origin| for realm |realm| and scheme |scheme|
@@ -77,8 +78,8 @@ class HttpAuthCache {
   bool Remove(const GURL& origin,
               const std::string& realm,
               const std::string& scheme,
-              const std::wstring& username,
-              const std::wstring& password);
+              const string16& username,
+              const string16& password);
 
   // Prevent unbounded memory growth. These are safeguards for abuse; it is
   // not expected that the limits will be reached in ordinary usage.
@@ -115,12 +116,12 @@ class HttpAuthCache::Entry {
   }
 
   // The login username.
-  const std::wstring username() const {
+  const string16 username() const {
     return username_;
   }
 
   // The login password.
-  const std::wstring password() const {
+  const string16 password() const {
     return password_;
   }
 
@@ -149,8 +150,8 @@ class HttpAuthCache::Entry {
 
   // Identity.
   std::string auth_challenge_;
-  std::wstring username_;
-  std::wstring password_;
+  string16 username_;
+  string16 password_;
 
   int nonce_count_;
 
@@ -159,6 +160,6 @@ class HttpAuthCache::Entry {
   PathList paths_;
 };
 
-} // namespace net
+}  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_CACHE_H_
-- 
cgit v1.1