| 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 9867bb99c1b491a6b53d696f0679260215fc2ae1..b77a3c74160e3643cfbb85b3b247340786f19a0b 100644
|
| --- a/net/http/http_auth_handler_factory.cc
|
| +++ b/net/http/http_auth_handler_factory.cc
|
| @@ -26,8 +26,8 @@ int HttpAuthHandlerFactory::CreateAuthHandlerFromString(
|
| const BoundNetLog& net_log,
|
| scoped_ptr<HttpAuthHandler>* handler) {
|
| HttpAuthChallengeTokenizer props(challenge.begin(), challenge.end());
|
| - return CreateAuthHandler(&props, target, origin, CREATE_CHALLENGE, 1,
|
| - net_log, handler);
|
| + return CreateAuthHandler(
|
| + &props, target, origin, CREATE_CHALLENGE, 1, net_log, handler);
|
| }
|
|
|
| int HttpAuthHandlerFactory::CreatePreemptiveAuthHandlerFromString(
|
| @@ -38,8 +38,13 @@ int HttpAuthHandlerFactory::CreatePreemptiveAuthHandlerFromString(
|
| const BoundNetLog& net_log,
|
| scoped_ptr<HttpAuthHandler>* handler) {
|
| HttpAuthChallengeTokenizer props(challenge.begin(), challenge.end());
|
| - return CreateAuthHandler(&props, target, origin, CREATE_PREEMPTIVE,
|
| - digest_nonce_count, net_log, handler);
|
| + return CreateAuthHandler(&props,
|
| + target,
|
| + origin,
|
| + CREATE_PREEMPTIVE,
|
| + digest_nonce_count,
|
| + net_log,
|
| + handler);
|
| }
|
|
|
| // static
|
| @@ -48,10 +53,10 @@ HttpAuthHandlerRegistryFactory* HttpAuthHandlerFactory::CreateDefault(
|
| DCHECK(host_resolver);
|
| HttpAuthHandlerRegistryFactory* registry_factory =
|
| new HttpAuthHandlerRegistryFactory();
|
| - registry_factory->RegisterSchemeFactory(
|
| - "basic", new HttpAuthHandlerBasic::Factory());
|
| - registry_factory->RegisterSchemeFactory(
|
| - "digest", new HttpAuthHandlerDigest::Factory());
|
| + registry_factory->RegisterSchemeFactory("basic",
|
| + new HttpAuthHandlerBasic::Factory());
|
| + registry_factory->RegisterSchemeFactory("digest",
|
| + new HttpAuthHandlerDigest::Factory());
|
|
|
| #if defined(USE_KERBEROS)
|
| HttpAuthHandlerNegotiate::Factory* negotiate_factory =
|
| @@ -78,8 +83,8 @@ namespace {
|
|
|
| bool IsSupportedScheme(const std::vector<std::string>& supported_schemes,
|
| const std::string& scheme) {
|
| - std::vector<std::string>::const_iterator it = std::find(
|
| - supported_schemes.begin(), supported_schemes.end(), scheme);
|
| + std::vector<std::string>::const_iterator it =
|
| + std::find(supported_schemes.begin(), supported_schemes.end(), scheme);
|
| return it != supported_schemes.end();
|
| }
|
|
|
| @@ -120,7 +125,7 @@ HttpAuthHandlerFactory* HttpAuthHandlerRegistryFactory::GetSchemeFactory(
|
| std::string lower_scheme = StringToLowerASCII(scheme);
|
| FactoryMap::const_iterator it = factory_map_.find(lower_scheme);
|
| if (it == factory_map_.end()) {
|
| - return NULL; // |scheme| is not registered.
|
| + return NULL; // |scheme| is not registered.
|
| }
|
| return it->second;
|
| }
|
| @@ -192,8 +197,8 @@ int HttpAuthHandlerRegistryFactory::CreateAuthHandler(
|
| return ERR_UNSUPPORTED_AUTH_SCHEME;
|
| }
|
| DCHECK(it->second);
|
| - return it->second->CreateAuthHandler(challenge, target, origin, reason,
|
| - digest_nonce_count, net_log, handler);
|
| + return it->second->CreateAuthHandler(
|
| + challenge, target, origin, reason, digest_nonce_count, net_log, handler);
|
| }
|
|
|
| } // namespace net
|
|
|