Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(299)

Unified Diff: net/http/http_auth_handler_negotiate_unittest.cc

Issue 8990001: base::Bind: Convert most of net/http. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clang. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4c013d21d514eaa2317e493eef01aef28ab87bb3..f43e39a21b72c2e1c5f9b2b7369f42538c4fa53c 100644
--- a/net/http/http_auth_handler_negotiate_unittest.cc
+++ b/net/http/http_auth_handler_negotiate_unittest.cc
@@ -220,11 +220,11 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCname) {
true, false, true, "http://alias:500", &auth_handler));
ASSERT_TRUE(auth_handler.get() != NULL);
- TestOldCompletionCallback callback;
+ TestCompletionCallback callback;
HttpRequestInfo request_info;
std::string token;
EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,
- &callback, &token));
+ callback.callback(), &token));
#if defined(OS_WIN)
EXPECT_EQ(L"HTTP/alias", auth_handler->spn());
#elif defined(OS_POSIX)
@@ -238,11 +238,11 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameStandardPort) {
EXPECT_EQ(OK, CreateHandler(
true, true, true, "http://alias:80", &auth_handler));
ASSERT_TRUE(auth_handler.get() != NULL);
- TestOldCompletionCallback callback;
+ TestCompletionCallback callback;
HttpRequestInfo request_info;
std::string token;
EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,
- &callback, &token));
+ callback.callback(), &token));
#if defined(OS_WIN)
EXPECT_EQ(L"HTTP/alias", auth_handler->spn());
#elif defined(OS_POSIX)
@@ -256,11 +256,11 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameNonstandardPort) {
EXPECT_EQ(OK, CreateHandler(
true, true, true, "http://alias:500", &auth_handler));
ASSERT_TRUE(auth_handler.get() != NULL);
- TestOldCompletionCallback callback;
+ TestCompletionCallback callback;
HttpRequestInfo request_info;
std::string token;
EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,
- &callback, &token));
+ callback.callback(), &token));
#if defined(OS_WIN)
EXPECT_EQ(L"HTTP/alias:500", auth_handler->spn());
#elif defined(OS_POSIX)
@@ -274,11 +274,11 @@ TEST_F(HttpAuthHandlerNegotiateTest, CnameSync) {
EXPECT_EQ(OK, CreateHandler(
false, false, true, "http://alias:500", &auth_handler));
ASSERT_TRUE(auth_handler.get() != NULL);
- TestOldCompletionCallback callback;
+ TestCompletionCallback callback;
HttpRequestInfo request_info;
std::string token;
EXPECT_EQ(OK, auth_handler->GenerateAuthToken(NULL, &request_info,
- &callback, &token));
+ callback.callback(), &token));
#if defined(OS_WIN)
EXPECT_EQ(L"HTTP/canonical.example.com", auth_handler->spn());
#elif defined(OS_POSIX)
@@ -292,11 +292,11 @@ TEST_F(HttpAuthHandlerNegotiateTest, CnameAsync) {
EXPECT_EQ(OK, CreateHandler(
false, false, false, "http://alias:500", &auth_handler));
ASSERT_TRUE(auth_handler.get() != NULL);
- TestOldCompletionCallback callback;
+ TestCompletionCallback callback;
HttpRequestInfo request_info;
std::string token;
EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken(
- NULL, &request_info, &callback, &token));
+ NULL, &request_info, callback.callback(), &token));
EXPECT_EQ(OK, callback.WaitForResult());
#if defined(OS_WIN)
EXPECT_EQ(L"HTTP/canonical.example.com", auth_handler->spn());
@@ -315,11 +315,11 @@ TEST_F(HttpAuthHandlerNegotiateTest, ServerNotInKerberosDatabase) {
EXPECT_EQ(OK, CreateHandler(
false, false, false, "http://alias:500", &auth_handler));
ASSERT_TRUE(auth_handler.get() != NULL);
- TestOldCompletionCallback callback;
+ TestCompletionCallback callback;
HttpRequestInfo request_info;
std::string token;
EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken(
- NULL, &request_info, &callback, &token));
+ NULL, &request_info, callback.callback(), &token));
EXPECT_EQ(ERR_MISSING_AUTH_CREDENTIALS, callback.WaitForResult());
}
@@ -331,11 +331,11 @@ TEST_F(HttpAuthHandlerNegotiateTest, NoKerberosCredentials) {
EXPECT_EQ(OK, CreateHandler(
false, false, false, "http://alias:500", &auth_handler));
ASSERT_TRUE(auth_handler.get() != NULL);
- TestOldCompletionCallback callback;
+ TestCompletionCallback callback;
HttpRequestInfo request_info;
std::string token;
EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken(
- NULL, &request_info, &callback, &token));
+ NULL, &request_info, callback.callback(), &token));
EXPECT_EQ(ERR_MISSING_AUTH_CREDENTIALS, callback.WaitForResult());
}

Powered by Google App Engine
This is Rietveld 408576698