Index: net/http/http_auth_handler_negotiate.cc |
diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc |
index 422ddd729a27cf4dc9c24198c4dc30e0087cd60c..b906f44bab3460c959c070c415e64038ddb153ee 100644 |
--- a/net/http/http_auth_handler_negotiate.cc |
+++ b/net/http/http_auth_handler_negotiate.cc |
@@ -48,8 +48,8 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandler( |
if (is_unsupported_ || reason == CREATE_PREEMPTIVE) |
return ERR_UNSUPPORTED_AUTH_SCHEME; |
if (max_token_length_ == 0) { |
- int rv = DetermineMaxTokenLength(auth_library_.get(), NEGOSSP_NAME, |
- &max_token_length_); |
+ int rv = DetermineMaxTokenLength( |
+ auth_library_.get(), NEGOSSP_NAME, &max_token_length_); |
if (rv == ERR_UNSUPPORTED_AUTH_SCHEME) |
is_unsupported_ = true; |
if (rv != OK) |
@@ -58,9 +58,12 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandler( |
// TODO(cbentzel): Move towards model of parsing in the factory |
// method and only constructing when valid. |
scoped_ptr<HttpAuthHandler> tmp_handler( |
- new HttpAuthHandlerNegotiate(auth_library_.get(), max_token_length_, |
- url_security_manager(), resolver_, |
- disable_cname_lookup_, use_port_)); |
+ new HttpAuthHandlerNegotiate(auth_library_.get(), |
+ max_token_length_, |
+ url_security_manager(), |
+ resolver_, |
+ disable_cname_lookup_, |
+ use_port_)); |
if (!tmp_handler->InitFromChallenge(challenge, target, origin, net_log)) |
return ERR_INVALID_RESPONSE; |
handler->swap(tmp_handler); |
@@ -75,8 +78,10 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandler( |
// TODO(ahendrickson): Move towards model of parsing in the factory |
// method and only constructing when valid. |
scoped_ptr<HttpAuthHandler> tmp_handler( |
- new HttpAuthHandlerNegotiate(auth_library_.get(), url_security_manager(), |
- resolver_, disable_cname_lookup_, |
+ new HttpAuthHandlerNegotiate(auth_library_.get(), |
+ url_security_manager(), |
+ resolver_, |
+ disable_cname_lookup_, |
use_port_)); |
if (!tmp_handler->InitFromChallenge(challenge, target, origin, net_log)) |
return ERR_INVALID_RESPONSE; |
@@ -112,8 +117,8 @@ HttpAuthHandlerNegotiate::HttpAuthHandlerNegotiate( |
HttpAuthHandlerNegotiate::~HttpAuthHandlerNegotiate() { |
} |
-std::string HttpAuthHandlerNegotiate::CreateSPN( |
- const AddressList& address_list, const GURL& origin) { |
+std::string HttpAuthHandlerNegotiate::CreateSPN(const AddressList& address_list, |
+ const GURL& origin) { |
// Kerberos Web Server SPNs are in the form HTTP/<host>:<port> through SSPI, |
// and in the form HTTP@<host>:<port> through GSSAPI |
// http://msdn.microsoft.com/en-us/library/ms677601%28VS.85%29.aspx |
@@ -153,8 +158,8 @@ std::string HttpAuthHandlerNegotiate::CreateSPN( |
static const char kSpnSeparator = '@'; |
#endif |
if (port != 80 && port != 443 && use_port_) { |
- return base::StringPrintf("HTTP%c%s:%d", kSpnSeparator, server.c_str(), |
- port); |
+ return base::StringPrintf( |
+ "HTTP%c%s:%d", kSpnSeparator, server.c_str(), port); |
} else { |
return base::StringPrintf("HTTP%c%s", kSpnSeparator, server.c_str()); |
} |
@@ -208,8 +213,10 @@ bool HttpAuthHandlerNegotiate::Init(HttpAuthChallengeTokenizer* challenge) { |
} |
int HttpAuthHandlerNegotiate::GenerateAuthTokenImpl( |
- const AuthCredentials* credentials, const HttpRequestInfo* request, |
- const CompletionCallback& callback, std::string* auth_token) { |
+ const AuthCredentials* credentials, |
+ const HttpRequestInfo* request, |
+ const CompletionCallback& callback, |
+ std::string* auth_token) { |
DCHECK(callback_.is_null()); |
DCHECK(auth_token_ == NULL); |
auth_token_ = auth_token; |