| Index: net/http/http_auth_handler_negotiate.h
|
| diff --git a/net/http/http_auth_handler_negotiate.h b/net/http/http_auth_handler_negotiate.h
|
| index 4b04f7b389a67d2665d77f4d6561db4e26c9af85..8619bf418aa50077ed924df629cb03f45ab4bda7 100644
|
| --- a/net/http/http_auth_handler_negotiate.h
|
| +++ b/net/http/http_auth_handler_negotiate.h
|
| @@ -8,7 +8,6 @@
|
|
|
| #include <string>
|
|
|
| -#include "base/string16.h"
|
| #include "build/build_config.h"
|
| #include "net/base/address_list.h"
|
| #include "net/base/net_export.h"
|
| @@ -116,8 +115,7 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNegotiate : public HttpAuthHandler {
|
| protected:
|
| virtual bool Init(HttpAuth::ChallengeTokenizer* challenge);
|
|
|
| - virtual int GenerateAuthTokenImpl(const string16* username,
|
| - const string16* password,
|
| + virtual int GenerateAuthTokenImpl(const AuthCredentials* credentials,
|
| const HttpRequestInfo* request,
|
| OldCompletionCallback* callback,
|
| std::string* auth_token);
|
| @@ -153,9 +151,8 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNegotiate : public HttpAuthHandler {
|
|
|
| // Things which should be consistent after first call to GenerateAuthToken.
|
| bool already_called_;
|
| - bool has_username_and_password_;
|
| - string16 username_;
|
| - string16 password_;
|
| + bool has_credentials_;
|
| + AuthCredentials credentials_;
|
| std::wstring spn_;
|
|
|
| // Things which vary each round.
|
|
|