Index: net/base/single_request_host_resolver_unittest.cc |
diff --git a/net/base/single_request_host_resolver_unittest.cc b/net/base/single_request_host_resolver_unittest.cc |
index 7106af5f0560029b6fad7f271efb498fe1cf0def..295a3186ae0611604d51d22fd2b84963c75ac17f 100644 |
--- a/net/base/single_request_host_resolver_unittest.cc |
+++ b/net/base/single_request_host_resolver_unittest.cc |
@@ -32,7 +32,7 @@ class HangingHostResolver : public HostResolver { |
virtual int Resolve(const RequestInfo& info, |
AddressList* addresses, |
- OldCompletionCallback* callback, |
+ const CompletionCallback& callback, |
RequestHandle* out_req, |
const BoundNetLog& net_log) OVERRIDE { |
EXPECT_FALSE(has_outstanding_request()); |
@@ -74,10 +74,10 @@ TEST(SingleRequestHostResolverTest, NormalResolve) { |
// Resolve "watsup:90" using our SingleRequestHostResolver. |
AddressList addrlist; |
- TestOldCompletionCallback callback; |
+ TestCompletionCallback callback; |
HostResolver::RequestInfo request(HostPortPair("watsup", 90)); |
int rv = single_request_resolver.Resolve( |
- request, &addrlist, &callback, BoundNetLog()); |
+ request, &addrlist, callback.callback(), BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_EQ(OK, callback.WaitForResult()); |
@@ -94,10 +94,10 @@ TEST(SingleRequestHostResolverTest, Cancel) { |
// Resolve "watsup:90" using our SingleRequestHostResolver. |
AddressList addrlist; |
- TestOldCompletionCallback callback; |
+ TestCompletionCallback callback; |
HostResolver::RequestInfo request(HostPortPair("watsup", 90)); |
int rv = single_request_resolver.Resolve( |
- request, &addrlist, &callback, BoundNetLog()); |
+ request, &addrlist, callback.callback(), BoundNetLog()); |
EXPECT_EQ(ERR_IO_PENDING, rv); |
EXPECT_TRUE(resolver.has_outstanding_request()); |
} |