| Index: net/http/http_auth_handler_negotiate_unittest.cc
|
| diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc
|
| index 49ebdad62adb5173e02d99f1bd679bcb662e4cad..f9950489e24d4efc05c5f0be64dcb9324f1600f8 100644
|
| --- a/net/http/http_auth_handler_negotiate_unittest.cc
|
| +++ b/net/http/http_auth_handler_negotiate_unittest.cc
|
| @@ -242,7 +242,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCname) {
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| EXPECT_EQ(OK, callback.GetResult(auth_handler->GenerateAuthToken(
|
| - NULL, &request_info, callback.callback(), &token)));
|
| + NULL, request_info, callback.callback(), &token)));
|
| #if defined(OS_WIN)
|
| EXPECT_EQ("HTTP/alias", auth_handler->spn());
|
| #elif defined(OS_POSIX)
|
| @@ -260,7 +260,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameStandardPort) {
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| EXPECT_EQ(OK, callback.GetResult(auth_handler->GenerateAuthToken(
|
| - NULL, &request_info, callback.callback(), &token)));
|
| + NULL, request_info, callback.callback(), &token)));
|
| #if defined(OS_WIN)
|
| EXPECT_EQ("HTTP/alias", auth_handler->spn());
|
| #elif defined(OS_POSIX)
|
| @@ -278,7 +278,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameNonstandardPort) {
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| EXPECT_EQ(OK, callback.GetResult(auth_handler->GenerateAuthToken(
|
| - NULL, &request_info, callback.callback(), &token)));
|
| + NULL, request_info, callback.callback(), &token)));
|
| #if defined(OS_WIN)
|
| EXPECT_EQ("HTTP/alias:500", auth_handler->spn());
|
| #elif defined(OS_POSIX)
|
| @@ -296,7 +296,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, CnameSync) {
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| EXPECT_EQ(OK, callback.GetResult(auth_handler->GenerateAuthToken(
|
| - NULL, &request_info, callback.callback(), &token)));
|
| + NULL, request_info, callback.callback(), &token)));
|
| #if defined(OS_WIN)
|
| EXPECT_EQ("HTTP/canonical.example.com", auth_handler->spn());
|
| #elif defined(OS_POSIX)
|
| @@ -313,8 +313,9 @@ TEST_F(HttpAuthHandlerNegotiateTest, CnameAsync) {
|
| TestCompletionCallback callback;
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| - EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken(
|
| - NULL, &request_info, callback.callback(), &token));
|
| + EXPECT_EQ(ERR_IO_PENDING,
|
| + auth_handler->GenerateAuthToken(NULL, request_info,
|
| + callback.callback(), &token));
|
| EXPECT_EQ(OK, callback.WaitForResult());
|
| #if defined(OS_WIN)
|
| EXPECT_EQ("HTTP/canonical.example.com", auth_handler->spn());
|
| @@ -336,8 +337,9 @@ TEST_F(HttpAuthHandlerNegotiateTest, ServerNotInKerberosDatabase) {
|
| TestCompletionCallback callback;
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| - EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken(
|
| - NULL, &request_info, callback.callback(), &token));
|
| + EXPECT_EQ(ERR_IO_PENDING,
|
| + auth_handler->GenerateAuthToken(NULL, request_info,
|
| + callback.callback(), &token));
|
| EXPECT_EQ(ERR_MISSING_AUTH_CREDENTIALS, callback.WaitForResult());
|
| }
|
|
|
| @@ -352,8 +354,9 @@ TEST_F(HttpAuthHandlerNegotiateTest, NoKerberosCredentials) {
|
| TestCompletionCallback callback;
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| - EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken(
|
| - NULL, &request_info, callback.callback(), &token));
|
| + EXPECT_EQ(ERR_IO_PENDING,
|
| + auth_handler->GenerateAuthToken(NULL, request_info,
|
| + callback.callback(), &token));
|
| EXPECT_EQ(ERR_MISSING_AUTH_CREDENTIALS, callback.WaitForResult());
|
| }
|
|
|
|
|