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 be0c3b0b54bcf69cd0d56a6fee8762a634344549..97085b2851aaf1f6d81b1e1e1138a5a2c28d625c 100644 |
--- a/net/http/http_auth_handler_factory_unittest.cc |
+++ b/net/http/http_auth_handler_factory_unittest.cc |
@@ -61,7 +61,7 @@ TEST(HttpAuthHandlerFactoryTest, RegistryFactory) { |
"Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler)); |
// Test what happens with a single scheme. |
- registry_factory.RegisterSchemeFactory("Basic", mock_factory_basic); |
+ registry_factory.RegisterSchemeFactory("basic", mock_factory_basic); |
EXPECT_EQ(kBasicReturnCode, |
registry_factory.CreateAuthHandlerFromString( |
"Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler)); |
@@ -71,7 +71,7 @@ TEST(HttpAuthHandlerFactoryTest, RegistryFactory) { |
&handler)); |
// Test multiple schemes |
- registry_factory.RegisterSchemeFactory("Digest", mock_factory_digest); |
+ registry_factory.RegisterSchemeFactory("digest", mock_factory_digest); |
EXPECT_EQ(kBasicReturnCode, |
registry_factory.CreateAuthHandlerFromString( |
"Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler)); |
@@ -86,7 +86,7 @@ TEST(HttpAuthHandlerFactoryTest, RegistryFactory) { |
"basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler)); |
// Test replacement of existing auth scheme |
- registry_factory.RegisterSchemeFactory("Digest", mock_factory_digest_replace); |
+ registry_factory.RegisterSchemeFactory("digest", mock_factory_digest_replace); |
EXPECT_EQ(kBasicReturnCode, |
registry_factory.CreateAuthHandlerFromString( |
"Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler)); |
@@ -115,11 +115,9 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) { |
&handler); |
EXPECT_EQ(OK, rv); |
ASSERT_FALSE(handler.get() == NULL); |
- EXPECT_EQ(HttpAuth::AUTH_SCHEME_BASIC, handler->auth_scheme()); |
+ EXPECT_EQ("basic", handler->auth_scheme()); |
EXPECT_STREQ("FooBar", handler->realm().c_str()); |
EXPECT_EQ(HttpAuth::AUTH_SERVER, handler->target()); |
- EXPECT_FALSE(handler->encrypts_identity()); |
- EXPECT_FALSE(handler->is_connection_based()); |
} |
{ |
scoped_ptr<HttpAuthHandler> handler; |
@@ -142,11 +140,9 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) { |
&handler); |
EXPECT_EQ(OK, rv); |
ASSERT_FALSE(handler.get() == NULL); |
- EXPECT_EQ(HttpAuth::AUTH_SCHEME_DIGEST, handler->auth_scheme()); |
+ EXPECT_EQ("digest", handler->auth_scheme()); |
EXPECT_STREQ("FooBar", handler->realm().c_str()); |
EXPECT_EQ(HttpAuth::AUTH_PROXY, handler->target()); |
- EXPECT_TRUE(handler->encrypts_identity()); |
- EXPECT_FALSE(handler->is_connection_based()); |
} |
{ |
scoped_ptr<HttpAuthHandler> handler; |
@@ -158,11 +154,9 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) { |
&handler); |
EXPECT_EQ(OK, rv); |
ASSERT_FALSE(handler.get() == NULL); |
- EXPECT_EQ(HttpAuth::AUTH_SCHEME_NTLM, handler->auth_scheme()); |
+ EXPECT_EQ("ntlm", handler->auth_scheme()); |
EXPECT_STREQ("", handler->realm().c_str()); |
EXPECT_EQ(HttpAuth::AUTH_SERVER, handler->target()); |
- EXPECT_TRUE(handler->encrypts_identity()); |
- EXPECT_TRUE(handler->is_connection_based()); |
} |
{ |
scoped_ptr<HttpAuthHandler> handler; |
@@ -176,11 +170,9 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) { |
#if defined(USE_KERBEROS) && !defined(OS_ANDROID) |
EXPECT_EQ(OK, rv); |
ASSERT_FALSE(handler.get() == NULL); |
- EXPECT_EQ(HttpAuth::AUTH_SCHEME_NEGOTIATE, handler->auth_scheme()); |
+ EXPECT_EQ("negotiate", handler->auth_scheme()); |
EXPECT_STREQ("", handler->realm().c_str()); |
EXPECT_EQ(HttpAuth::AUTH_SERVER, handler->target()); |
- EXPECT_TRUE(handler->encrypts_identity()); |
- EXPECT_TRUE(handler->is_connection_based()); |
#else |
EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME, rv); |
EXPECT_TRUE(handler.get() == NULL); |