| 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 ddf8c70e06ca091fec05720a9a48c3993464d3ed..4e9bf8d66da18709af88def631df2e925f5e1e82 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());
|
| @@ -82,10 +82,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());
|
|
|
| @@ -102,10 +102,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());
|
| }
|
|
|