| Index: net/http/http_auth_cache.h
|
| ===================================================================
|
| --- net/http/http_auth_cache.h (revision 53997)
|
| +++ net/http/http_auth_cache.h (working copy)
|
| @@ -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 @@
|
| 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 @@
|
| 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 @@
|
| }
|
|
|
| // 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 @@
|
|
|
| // Identity.
|
| std::string auth_challenge_;
|
| - std::wstring username_;
|
| - std::wstring password_;
|
| + string16 username_;
|
| + string16 password_;
|
|
|
| int nonce_count_;
|
|
|
| @@ -159,6 +160,6 @@
|
| PathList paths_;
|
| };
|
|
|
| -} // namespace net
|
| +} // namespace net
|
|
|
| #endif // NET_HTTP_HTTP_AUTH_CACHE_H_
|
|
|