| 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 fc596fa6db1e49ea673ed7e7b95b12d106c11381..26cc67175cb06bd3d86f44e5e1661ee3789ded72 100644
|
| --- a/net/http/http_auth_handler_negotiate.h
|
| +++ b/net/http/http_auth_handler_negotiate.h
|
| @@ -13,7 +13,9 @@
|
| #include "net/http/http_auth_handler.h"
|
| #include "net/http/http_auth_handler_factory.h"
|
|
|
| -#if defined(OS_WIN)
|
| +#if defined(OS_ANDROID)
|
| +#include "net/android/http_auth_negotiate_android.h"
|
| +#elif defined(OS_WIN)
|
| #include "net/http/http_auth_sspi_win.h"
|
| #elif defined(OS_POSIX)
|
| #include "net/http/http_auth_gssapi_posix.h"
|
| @@ -32,7 +34,10 @@ class URLSecurityManager;
|
|
|
| class NET_EXPORT_PRIVATE HttpAuthHandlerNegotiate : public HttpAuthHandler {
|
| public:
|
| -#if defined(OS_WIN)
|
| +#if defined(OS_ANDROID)
|
| + typedef net::android::HttpAuthNegotiateAndroid AuthSystem;
|
| + typedef const std::string AuthLibrary;
|
| +#elif defined(OS_WIN)
|
| typedef SSPILibrary AuthLibrary;
|
| typedef HttpAuthSSPI AuthSystem;
|
| #elif defined(OS_POSIX)
|
| @@ -65,8 +70,8 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNegotiate : public HttpAuthHandler {
|
|
|
| // Sets the system library to use, thereby assuming ownership of
|
| // |auth_library|.
|
| - void set_library(AuthLibrary* auth_library) {
|
| - auth_library_.reset(auth_library);
|
| + void set_library(AuthLibrary* auth_provider) {
|
| + auth_library_.reset(auth_provider);
|
| }
|
|
|
| int CreateAuthHandler(HttpAuthChallengeTokenizer* challenge,
|
|
|