| 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 92b1b52160599a58f21752f2d7d3a8bbf254b6c4..3fd8267e61fd89a9ff28dead71d7fa91211a412b 100644
|
| --- a/net/http/http_auth_handler_negotiate.h
|
| +++ b/net/http/http_auth_handler_negotiate.h
|
| @@ -52,30 +52,40 @@ class NET_EXPORT_PRIVATE HttpAuthHandlerNegotiate : public HttpAuthHandler {
|
| Factory();
|
| ~Factory() override;
|
|
|
| - // |disable_cname_lookup()| and |set_disable_cname_lookup()| get/set whether
|
| + // |disable_cname_lookup()| gets whether
|
| // the auth handlers generated by this factory should skip looking up the
|
| // canonical DNS name of the the host that they are authenticating to when
|
| // generating the SPN. The default value is false.
|
| bool disable_cname_lookup() const { return disable_cname_lookup_; }
|
| - void set_disable_cname_lookup(bool disable_cname_lookup) {
|
| - disable_cname_lookup_ = disable_cname_lookup;
|
| - }
|
|
|
| - // |use_port()| and |set_use_port()| get/set whether the auth handlers
|
| + // |use_port()| gets whether the auth handlers
|
| // generated by this factory should include the port number of the server
|
| // they are authenticating to when constructing a Kerberos SPN. The default
|
| // value is false.
|
| bool use_port() const { return use_port_; }
|
| - void set_use_port(bool use_port) { use_port_ = use_port; }
|
|
|
| void set_host_resolver(HostResolver* host_resolver);
|
|
|
| // Sets the system library to use, thereby assuming ownership of
|
| // |auth_library|.
|
| - void set_library(AuthLibrary* auth_provider) {
|
| - auth_library_.reset(auth_provider);
|
| + void set_library(scoped_ptr<AuthLibrary> auth_provider) {
|
| + auth_library_ = auth_provider.Pass();
|
| }
|
|
|
| +#if defined(OS_ANDROID)
|
| + // Only used for testing.
|
| + AuthLibrary* library() { return auth_library_.get(); }
|
| +#endif
|
| +
|
| + // HttpAuthHandlerFactory overrides
|
| + void SetNegotiateDisableCnameLookup(bool disable_cname_lookup) override;
|
| + void SetNegotiateEnablePort(bool use_port) override;
|
| +#if defined(OS_ANDROID)
|
| + void SetAndroidAuthNegotiateAccountType(
|
| + const std::string& account_type) override;
|
| +
|
| +#endif
|
| +
|
| int CreateAuthHandler(HttpAuthChallengeTokenizer* challenge,
|
| HttpAuth::Target target,
|
| const GURL& origin,
|
|
|