summaryrefslogtreecommitdiffstats
path: root/net/http/http_auth_cache.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 06:15:44 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 06:15:44 +0000
commit13c8a0903376ff406151679d8673a6452d721290 (patch)
treedbb5b8e9503f8d0ee447863089f3e6f23692910f /net/http/http_auth_cache.cc
parent6b55570f03236557b8b966b08dfbdda1ea91aadc (diff)
downloadchromium_src-13c8a0903376ff406151679d8673a6452d721290.zip
chromium_src-13c8a0903376ff406151679d8673a6452d721290.tar.gz
chromium_src-13c8a0903376ff406151679d8673a6452d721290.tar.bz2
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
Diffstat (limited to 'net/http/http_auth_cache.cc')
-rw-r--r--net/http/http_auth_cache.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/http/http_auth_cache.cc b/net/http/http_auth_cache.cc
index 21db55d..58a90f1 100644
--- a/net/http/http_auth_cache.cc
+++ b/net/http/http_auth_cache.cc
@@ -48,14 +48,14 @@ void CheckOriginIsValid(const GURL& origin) {
// Functor used by remove_if.
struct IsEnclosedBy {
- IsEnclosedBy(const std::string& path) : path(path) { }
+ explicit IsEnclosedBy(const std::string& path) : path(path) { }
bool operator() (const std::string& x) {
return IsEnclosingPath(path, x);
}
const std::string& path;
};
-} // namespace
+} // namespace
namespace net {
@@ -71,7 +71,7 @@ HttpAuthCache::Entry* HttpAuthCache::Lookup(const GURL& origin,
it->scheme() == scheme)
return &(*it);
}
- return NULL; // No realm entry found.
+ return NULL; // No realm entry found.
}
// Performance: O(n*m), where n is the number of realm entries, m is the number
@@ -93,15 +93,15 @@ HttpAuthCache::Entry* HttpAuthCache::LookupByPath(const GURL& origin,
if (it->origin() == origin && it->HasEnclosingPath(parent_dir))
return &(*it);
}
- return NULL; // No entry found.
+ return NULL; // No entry found.
}
HttpAuthCache::Entry* HttpAuthCache::Add(const GURL& origin,
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) {
CheckOriginIsValid(origin);
CheckPathIsValid(path);
@@ -165,8 +165,8 @@ bool HttpAuthCache::Entry::HasEnclosingPath(const std::string& dir) {
bool HttpAuthCache::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) {
for (EntryList::iterator it = entries_.begin(); it != entries_.end(); ++it) {
if (it->origin() == origin && it->realm() == realm &&
it->scheme() == scheme) {
@@ -180,4 +180,4 @@ bool HttpAuthCache::Remove(const GURL& origin,
return false;
}
-} // namespace net
+} // namespace net