| Index: net/http/http_auth_cache.cc
|
| ===================================================================
|
| --- net/http/http_auth_cache.cc (revision 53997)
|
| +++ net/http/http_auth_cache.cc (working copy)
|
| @@ -48,14 +48,14 @@
|
|
|
| // 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 @@
|
| 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 @@
|
| 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::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 @@
|
| return false;
|
| }
|
|
|
| -} // namespace net
|
| +} // namespace net
|
|
|