Index: net/http/http_auth_gssapi_posix.h |
=================================================================== |
--- net/http/http_auth_gssapi_posix.h (revision 53997) |
+++ net/http/http_auth_gssapi_posix.h (working copy) |
@@ -10,6 +10,7 @@ |
#include "base/gtest_prod_util.h" |
#include "base/native_library.h" |
+#include "base/string16.h" |
#include "net/http/http_auth.h" |
#define GSS_USE_FUNCTION_POINTERS |
@@ -201,7 +202,7 @@ |
// scope. |
class ScopedSecurityContext { |
public: |
- ScopedSecurityContext(GSSAPILibrary* gssapi_lib); |
+ explicit ScopedSecurityContext(GSSAPILibrary* gssapi_lib); |
~ScopedSecurityContext(); |
const gss_ctx_id_t get() const { return security_context_; } |
@@ -238,21 +239,21 @@ |
// If this is the first round of a multiple round scheme, credentials are |
// obtained using |*username| and |*password|. If |username| and |password| |
// are NULL, the default credentials are used instead. |
- int GenerateAuthToken(const std::wstring* username, |
- const std::wstring* password, |
+ int GenerateAuthToken(const string16* username, |
+ const string16* password, |
const std::wstring& spn, |
std::string* auth_token); |
private: |
- int OnFirstRound(const std::wstring* username, |
- const std::wstring* password); |
+ int OnFirstRound(const string16* username, |
+ const string16* password); |
int GetNextSecurityToken(const std::wstring& spn, |
gss_buffer_t in_token, |
gss_buffer_t out_token); |
std::string scheme_; |
- std::wstring username_; |
- std::wstring password_; |
+ string16 username_; |
+ string16 password_; |
gss_OID gss_oid_; |
GSSAPILibrary* library_; |
std::string decoded_server_auth_token_; |
Property changes on: net/http/http_auth_gssapi_posix.h |
___________________________________________________________________ |
Added: svn:eol-style |
+ LF |