| Index: net/http/http_auth_handler_factory_unittest.cc
|
| diff --git a/net/http/http_auth_handler_factory_unittest.cc b/net/http/http_auth_handler_factory_unittest.cc
|
| index 06e8933f25a2adf245e32c4f5c5dd5c7fa9a65a5..7c4b31bfe2ffc1e3655a8a0c9aeb777a4aa517ac 100644
|
| --- a/net/http/http_auth_handler_factory_unittest.cc
|
| +++ b/net/http/http_auth_handler_factory_unittest.cc
|
| @@ -17,8 +17,8 @@ namespace {
|
|
|
| class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory {
|
| public:
|
| - explicit MockHttpAuthHandlerFactory(int return_code) :
|
| - return_code_(return_code) {}
|
| + explicit MockHttpAuthHandlerFactory(int return_code)
|
| + : return_code_(return_code) {}
|
| virtual ~MockHttpAuthHandlerFactory() {}
|
|
|
| virtual int CreateAuthHandler(HttpAuthChallengeTokenizer* challenge,
|
| @@ -65,20 +65,20 @@ TEST(HttpAuthHandlerFactoryTest, RegistryFactory) {
|
| EXPECT_EQ(kBasicReturnCode,
|
| registry_factory.CreateAuthHandlerFromString(
|
| "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
|
| - EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME,
|
| - registry_factory.CreateAuthHandlerFromString(
|
| - "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(),
|
| - &handler));
|
| + EXPECT_EQ(
|
| + ERR_UNSUPPORTED_AUTH_SCHEME,
|
| + registry_factory.CreateAuthHandlerFromString(
|
| + "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
|
|
|
| // Test multiple schemes
|
| registry_factory.RegisterSchemeFactory("Digest", mock_factory_digest);
|
| EXPECT_EQ(kBasicReturnCode,
|
| registry_factory.CreateAuthHandlerFromString(
|
| "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
|
| - EXPECT_EQ(kDigestReturnCode,
|
| - registry_factory.CreateAuthHandlerFromString(
|
| - "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(),
|
| - &handler));
|
| + EXPECT_EQ(
|
| + kDigestReturnCode,
|
| + registry_factory.CreateAuthHandlerFromString(
|
| + "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
|
|
|
| // Test case-insensitivity
|
| EXPECT_EQ(kBasicReturnCode,
|
| @@ -90,10 +90,10 @@ TEST(HttpAuthHandlerFactoryTest, RegistryFactory) {
|
| EXPECT_EQ(kBasicReturnCode,
|
| registry_factory.CreateAuthHandlerFromString(
|
| "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
|
| - EXPECT_EQ(kDigestReturnCodeReplace,
|
| - registry_factory.CreateAuthHandlerFromString(
|
| - "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(),
|
| - &handler));
|
| + EXPECT_EQ(
|
| + kDigestReturnCodeReplace,
|
| + registry_factory.CreateAuthHandlerFromString(
|
| + "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
|
| }
|
|
|
| TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
|
| @@ -101,8 +101,8 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
|
| MockAllowURLSecurityManager url_security_manager;
|
| scoped_ptr<HttpAuthHandlerRegistryFactory> http_auth_handler_factory(
|
| HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
|
| - http_auth_handler_factory->SetURLSecurityManager(
|
| - "negotiate", &url_security_manager);
|
| + http_auth_handler_factory->SetURLSecurityManager("negotiate",
|
| + &url_security_manager);
|
| GURL server_origin("http://www.example.com");
|
| GURL proxy_origin("http://cache.example.com:3128");
|
| {
|
| @@ -151,11 +151,7 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
|
| {
|
| scoped_ptr<HttpAuthHandler> handler;
|
| int rv = http_auth_handler_factory->CreateAuthHandlerFromString(
|
| - "NTLM",
|
| - HttpAuth::AUTH_SERVER,
|
| - server_origin,
|
| - BoundNetLog(),
|
| - &handler);
|
| + "NTLM", HttpAuth::AUTH_SERVER, server_origin, BoundNetLog(), &handler);
|
| EXPECT_EQ(OK, rv);
|
| ASSERT_FALSE(handler.get() == NULL);
|
| EXPECT_EQ(HttpAuth::AUTH_SCHEME_NTLM, handler->auth_scheme());
|
|
|