| 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 e43d99446191fe73e2faf2427d2d021856f87c38..4c013d21d514eaa2317e493eef01aef28ab87bb3 100644
|
| --- a/net/http/http_auth_handler_negotiate_unittest.cc
|
| +++ b/net/http/http_auth_handler_negotiate_unittest.cc
|
| @@ -223,8 +223,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCname) {
|
| TestOldCompletionCallback callback;
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| - EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, NULL,
|
| - &request_info,
|
| + EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,
|
| &callback, &token));
|
| #if defined(OS_WIN)
|
| EXPECT_EQ(L"HTTP/alias", auth_handler->spn());
|
| @@ -242,8 +241,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameStandardPort) {
|
| TestOldCompletionCallback callback;
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| - EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, NULL,
|
| - &request_info,
|
| + EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,
|
| &callback, &token));
|
| #if defined(OS_WIN)
|
| EXPECT_EQ(L"HTTP/alias", auth_handler->spn());
|
| @@ -261,8 +259,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameNonstandardPort) {
|
| TestOldCompletionCallback callback;
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| - EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, NULL,
|
| - &request_info,
|
| + EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,
|
| &callback, &token));
|
| #if defined(OS_WIN)
|
| EXPECT_EQ(L"HTTP/alias:500", auth_handler->spn());
|
| @@ -280,8 +277,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, CnameSync) {
|
| TestOldCompletionCallback callback;
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| - EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, NULL,
|
| - &request_info,
|
| + EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,
|
| &callback, &token));
|
| #if defined(OS_WIN)
|
| EXPECT_EQ(L"HTTP/canonical.example.com", auth_handler->spn());
|
| @@ -300,7 +296,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, CnameAsync) {
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken(
|
| - NULL, NULL, &request_info, &callback, &token));
|
| + NULL, &request_info, &callback, &token));
|
| EXPECT_EQ(OK, callback.WaitForResult());
|
| #if defined(OS_WIN)
|
| EXPECT_EQ(L"HTTP/canonical.example.com", auth_handler->spn());
|
| @@ -323,7 +319,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, ServerNotInKerberosDatabase) {
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken(
|
| - NULL, NULL, &request_info, &callback, &token));
|
| + NULL, &request_info, &callback, &token));
|
| EXPECT_EQ(ERR_MISSING_AUTH_CREDENTIALS, callback.WaitForResult());
|
| }
|
|
|
| @@ -339,7 +335,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, NoKerberosCredentials) {
|
| HttpRequestInfo request_info;
|
| std::string token;
|
| EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken(
|
| - NULL, NULL, &request_info, &callback, &token));
|
| + NULL, &request_info, &callback, &token));
|
| EXPECT_EQ(ERR_MISSING_AUTH_CREDENTIALS, callback.WaitForResult());
|
| }
|
|
|
|
|