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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/dns/async_host_resolver_unittest.cc

Issue 8549004: base::Bind: Convert HostResolver::Resolve. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« net/base/mapped_host_resolver.cc ('K') | « net/dns/async_host_resolver.cc ('k') | net/ftp/ftp_network_transaction.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/async_host_resolver_unittest.cc
diff --git a/net/dns/async_host_resolver_unittest.cc b/net/dns/async_host_resolver_unittest.cc
index 7da3bc7906893f601d8ce16e2e4c16d3391088f4..3b715fb9431e6e66e5c86cd906f5f13f6fe7951b 100644
--- a/net/dns/async_host_resolver_unittest.cc
+++ b/net/dns/async_host_resolver_unittest.cc
@@ -148,12 +148,12 @@ class AsyncHostResolverTest : public testing::Test {
TestPrng test_prng_;
RandIntCallback rand_int_cb_;
scoped_ptr<HostResolver> resolver_;
- TestOldCompletionCallback callback0_, callback1_, callback2_, callback3_;
+ TestCompletionCallback callback0_, callback1_, callback2_, callback3_;
};
TEST_F(AsyncHostResolverTest, EmptyHostLookup) {
info0_.set_host_port_pair(HostPortPair("", kPortNum));
- int rv = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, rv);
}
@@ -162,7 +162,7 @@ TEST_F(AsyncHostResolverTest, IPv4LiteralLookup) {
const char* kIPLiteral = "192.168.1.2";
info0_.set_host_port_pair(HostPortPair(kIPLiteral, kPortNum));
info0_.set_host_resolver_flags(HOST_RESOLVER_CANONNAME);
- int rv = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(OK, rv);
std::vector<const char*> ip_addresses(1, kIPLiteral);
@@ -172,7 +172,7 @@ TEST_F(AsyncHostResolverTest, IPv4LiteralLookup) {
TEST_F(AsyncHostResolverTest, IPv6LiteralLookup) {
info0_.set_host_port_pair(HostPortPair("2001:db8:0::42", kPortNum));
- int rv = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
// When support for IPv6 is added, this should succeed.
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, rv);
@@ -183,7 +183,7 @@ TEST_F(AsyncHostResolverTest, CachedLookup) {
EXPECT_EQ(ERR_DNS_CACHE_MISS, rv);
// Cache the result of |info0_| lookup.
- rv = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ rv = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback0_.WaitForResult();
@@ -200,19 +200,19 @@ TEST_F(AsyncHostResolverTest, CachedLookup) {
TEST_F(AsyncHostResolverTest, InvalidHostNameLookup) {
const std::string kHostName1(64, 'a');
info0_.set_host_port_pair(HostPortPair(kHostName1, kPortNum));
- int rv = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, rv);
const std::string kHostName2(4097, 'b');
info0_.set_host_port_pair(HostPortPair(kHostName2, kPortNum));
- rv = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ rv = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, rv);
}
TEST_F(AsyncHostResolverTest, Lookup) {
- int rv = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
rv = callback0_.WaitForResult();
@@ -221,11 +221,11 @@ TEST_F(AsyncHostResolverTest, Lookup) {
}
TEST_F(AsyncHostResolverTest, ConcurrentLookup) {
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
- int rv1 = resolver_->Resolve(info1_, &addrlist1_, &callback1_, NULL,
+ int rv1 = resolver_->Resolve(info1_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
- int rv2 = resolver_->Resolve(info2_, &addrlist2_, &callback2_, NULL,
+ int rv2 = resolver_->Resolve(info2_, &addrlist2_, callback2_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv0);
EXPECT_EQ(ERR_IO_PENDING, rv1);
@@ -248,11 +248,11 @@ TEST_F(AsyncHostResolverTest, ConcurrentLookup) {
TEST_F(AsyncHostResolverTest, SameHostLookupsConsumeSingleTransaction) {
// We pass the info0_ to all requests.
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
- int rv1 = resolver_->Resolve(info0_, &addrlist1_, &callback1_, NULL,
+ int rv1 = resolver_->Resolve(info0_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
- int rv2 = resolver_->Resolve(info0_, &addrlist2_, &callback2_, NULL,
+ int rv2 = resolver_->Resolve(info0_, &addrlist2_, callback2_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv0);
EXPECT_EQ(ERR_IO_PENDING, rv1);
@@ -276,12 +276,12 @@ TEST_F(AsyncHostResolverTest, SameHostLookupsConsumeSingleTransaction) {
TEST_F(AsyncHostResolverTest, CancelLookup) {
HostResolver::RequestHandle req0 = NULL, req2 = NULL;
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, &req0,
- BoundNetLog());
- int rv1 = resolver_->Resolve(info1_, &addrlist1_, &callback1_, NULL,
- BoundNetLog());
- int rv2 = resolver_->Resolve(info2_, &addrlist2_, &callback2_, &req2,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(),
+ &req0, BoundNetLog());
+ int rv1 = resolver_->Resolve(info1_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
+ int rv2 = resolver_->Resolve(info2_, &addrlist2_, callback2_.callback(),
+ &req2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv0);
EXPECT_EQ(ERR_IO_PENDING, rv1);
EXPECT_EQ(ERR_IO_PENDING, rv2);
@@ -305,9 +305,9 @@ TEST_F(AsyncHostResolverTest, CancelSameHostLookup) {
HostResolver::RequestHandle req0 = NULL;
// Pass the info0_ to both requests.
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, &req0,
- BoundNetLog());
- int rv1 = resolver_->Resolve(info0_, &addrlist1_, &callback1_, NULL,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(),
+ &req0, BoundNetLog());
+ int rv1 = resolver_->Resolve(info0_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv0);
EXPECT_EQ(ERR_IO_PENDING, rv1);
@@ -327,15 +327,15 @@ TEST_F(AsyncHostResolverTest, CancelSameHostLookup) {
TEST_F(AsyncHostResolverTest, QueuedLookup) {
// kMaxTransactions is 2, thus the following requests consume all
// available transactions.
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
- int rv1 = resolver_->Resolve(info1_, &addrlist1_, &callback1_, NULL,
+ int rv1 = resolver_->Resolve(info1_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv0);
EXPECT_EQ(ERR_IO_PENDING, rv1);
// The following request will end up in queue.
- int rv2 = resolver_->Resolve(info2_, &addrlist2_, &callback2_, NULL,
+ int rv2 = resolver_->Resolve(info2_, &addrlist2_, callback2_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv2);
EXPECT_EQ(1u,
@@ -359,17 +359,17 @@ TEST_F(AsyncHostResolverTest, QueuedLookup) {
TEST_F(AsyncHostResolverTest, CancelPendingLookup) {
// kMaxTransactions is 2, thus the following requests consume all
// available transactions.
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
- int rv1 = resolver_->Resolve(info1_, &addrlist1_, &callback1_, NULL,
+ int rv1 = resolver_->Resolve(info1_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv0);
EXPECT_EQ(ERR_IO_PENDING, rv1);
// The following request will end up in queue.
HostResolver::RequestHandle req2 = NULL;
- int rv2 = resolver_->Resolve(info2_, &addrlist2_, &callback2_, &req2,
- BoundNetLog());
+ int rv2 = resolver_->Resolve(info2_, &addrlist2_, callback2_.callback(),
+ &req2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv2);
EXPECT_EQ(1u,
static_cast<AsyncHostResolver*>(resolver_.get())->GetNumPending());
@@ -390,12 +390,12 @@ TEST_F(AsyncHostResolverTest, CancelPendingLookup) {
}
TEST_F(AsyncHostResolverTest, ResolverDestructionCancelsLookups) {
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
- int rv1 = resolver_->Resolve(info1_, &addrlist1_, &callback1_, NULL,
+ int rv1 = resolver_->Resolve(info1_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
// This one is queued.
- int rv2 = resolver_->Resolve(info2_, &addrlist2_, &callback2_, NULL,
+ int rv2 = resolver_->Resolve(info2_, &addrlist2_, callback2_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(1u,
static_cast<AsyncHostResolver*>(resolver_.get())->GetNumPending());
@@ -416,12 +416,12 @@ TEST_F(AsyncHostResolverTest, ResolverDestructionCancelsLookups) {
// Test that when the number of pending lookups is at max, a new lookup
// with a priority lower than all of those in the queue fails.
TEST_F(AsyncHostResolverTest, OverflowQueueWithLowPriorityLookup) {
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
- int rv1 = resolver_->Resolve(info1_, &addrlist1_, &callback1_, NULL,
+ int rv1 = resolver_->Resolve(info1_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
// This one is queued and fills up the queue since its size is 1.
- int rv2 = resolver_->Resolve(info2_, &addrlist2_, &callback2_, NULL,
+ int rv2 = resolver_->Resolve(info2_, &addrlist2_, callback2_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(1u,
static_cast<AsyncHostResolver*>(resolver_.get())->GetNumPending());
@@ -432,7 +432,7 @@ TEST_F(AsyncHostResolverTest, OverflowQueueWithLowPriorityLookup) {
// This one fails.
info3_.set_priority(LOWEST);
- int rv3 = resolver_->Resolve(info3_, &addrlist3_, &callback3_, NULL,
+ int rv3 = resolver_->Resolve(info3_, &addrlist3_, callback3_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_HOST_RESOLVER_QUEUE_TOO_LARGE, rv3);
@@ -444,9 +444,9 @@ TEST_F(AsyncHostResolverTest, OverflowQueueWithLowPriorityLookup) {
// with a priority higher than any of those in the queue succeeds and
// causes the lowest priority lookup in the queue to fail.
TEST_F(AsyncHostResolverTest, OverflowQueueWithHighPriorityLookup) {
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
- int rv1 = resolver_->Resolve(info1_, &addrlist1_, &callback1_, NULL,
+ int rv1 = resolver_->Resolve(info1_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
// Next lookup is queued. Since this will be ejected from the queue and
@@ -455,8 +455,9 @@ TEST_F(AsyncHostResolverTest, OverflowQueueWithHighPriorityLookup) {
HostResolver::RequestInfo info(HostPortPair("cnn.com", 80));
info.set_address_family(ADDRESS_FAMILY_IPV4);
AddressList addrlist_fail;
- TestOldCompletionCallback callback_fail;
- int rv_fail = resolver_->Resolve(info, &addrlist_fail, &callback_fail, NULL,
+ TestCompletionCallback callback_fail;
+ int rv_fail = resolver_->Resolve(info, &addrlist_fail,
+ callback_fail.callback(), NULL,
BoundNetLog());
EXPECT_EQ(1u,
static_cast<AsyncHostResolver*>(resolver_.get())->GetNumPending());
@@ -467,7 +468,7 @@ TEST_F(AsyncHostResolverTest, OverflowQueueWithHighPriorityLookup) {
// Lookup 2 causes the above to fail, but itself should succeed.
info2_.set_priority(HIGHEST);
- int rv2 = resolver_->Resolve(info2_, &addrlist2_, &callback2_, NULL,
+ int rv2 = resolver_->Resolve(info2_, &addrlist2_, callback2_.callback(), NULL,
BoundNetLog());
rv0 = callback0_.WaitForResult();
@@ -494,14 +495,14 @@ TEST_F(AsyncHostResolverTest, Observers) {
TestHostResolverObserver observer;
resolver_->AddObserver(&observer);
- int rv0 = resolver_->Resolve(info0_, &addrlist0_, &callback0_, NULL,
+ int rv0 = resolver_->Resolve(info0_, &addrlist0_, callback0_.callback(), NULL,
BoundNetLog());
- int rv1 = resolver_->Resolve(info1_, &addrlist1_, &callback1_, NULL,
+ int rv1 = resolver_->Resolve(info1_, &addrlist1_, callback1_.callback(), NULL,
BoundNetLog());
// We will cancel this one.
HostResolver::RequestHandle req2 = NULL;
- int rv2 = resolver_->Resolve(info2_, &addrlist2_, &callback2_, &req2,
- BoundNetLog());
+ int rv2 = resolver_->Resolve(info2_, &addrlist2_, callback2_.callback(),
+ &req2, BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv0);
EXPECT_EQ(ERR_IO_PENDING, rv1);
EXPECT_EQ(ERR_IO_PENDING, rv2);
@@ -549,7 +550,7 @@ TEST_F(AsyncHostResolverTest, Observers) {
resolver_->RemoveObserver(&observer);
// We will do lookup 2 again but will not cancel it this time.
- rv2 = resolver_->Resolve(info2_, &addrlist2_, &callback2_, NULL,
+ rv2 = resolver_->Resolve(info2_, &addrlist2_, callback2_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv2);
@@ -567,7 +568,7 @@ TEST_F(AsyncHostResolverTest, Observers) {
resolver_->AddObserver(&observer);
// Start lookup 3.
- int rv3 = resolver_->Resolve(info3_, &addrlist3_, &callback3_, NULL,
+ int rv3 = resolver_->Resolve(info3_, &addrlist3_, callback3_.callback(), NULL,
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv3);
« net/base/mapped_host_resolver.cc ('K') | « net/dns/async_host_resolver.cc ('k') | net/ftp/ftp_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698