| Index: net/http/http_auth_handler_factory.cc
|
| diff --git a/net/http/http_auth_handler_factory.cc b/net/http/http_auth_handler_factory.cc
|
| index decb20e49c0348ff04eb97f7cdbdac92de5e82b0..f87f734d34c7c67f0f4701b04087e3af0a61ce24 100644
|
| --- a/net/http/http_auth_handler_factory.cc
|
| +++ b/net/http/http_auth_handler_factory.cc
|
| @@ -56,7 +56,7 @@ HttpAuthHandlerRegistryFactory* HttpAuthHandlerFactory::CreateDefault(
|
| #if defined(USE_KERBEROS)
|
| HttpAuthHandlerNegotiate::Factory* negotiate_factory =
|
| new HttpAuthHandlerNegotiate::Factory();
|
| -#if defined(OS_POSIX)
|
| +#if defined(OS_POSIX) && !defined(OS_ANDROID)
|
| negotiate_factory->set_library(new GSSAPISharedLibrary(std::string()));
|
| #elif defined(OS_WIN)
|
| negotiate_factory->set_library(new SSPILibraryDefault());
|
| @@ -131,6 +131,7 @@ HttpAuthHandlerRegistryFactory* HttpAuthHandlerRegistryFactory::Create(
|
| URLSecurityManager* security_manager,
|
| HostResolver* host_resolver,
|
| const std::string& gssapi_library_name,
|
| + const std::string& auth_android_negotiate_account_type,
|
| bool negotiate_disable_cname_lookup,
|
| bool negotiate_enable_port) {
|
| HttpAuthHandlerRegistryFactory* registry_factory =
|
| @@ -154,7 +155,9 @@ HttpAuthHandlerRegistryFactory* HttpAuthHandlerRegistryFactory::Create(
|
| if (IsSupportedScheme(supported_schemes, "negotiate")) {
|
| HttpAuthHandlerNegotiate::Factory* negotiate_factory =
|
| new HttpAuthHandlerNegotiate::Factory();
|
| -#if defined(OS_POSIX)
|
| +#if defined(OS_ANDROID)
|
| + negotiate_factory->set_account_type(auth_android_negotiate_account_type);
|
| +#elif defined(OS_POSIX)
|
| negotiate_factory->set_library(
|
| new GSSAPISharedLibrary(gssapi_library_name));
|
| #elif defined(OS_WIN)
|
|
|