net/base/mapped_host_resolver_unittest.cc - Issue 8549004: base::Bind: Convert HostResolver::Resolve.

Unified Diff: net/base/mapped_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

Index: net/base/mapped_host_resolver_unittest.cc

diff --git a/net/base/mapped_host_resolver_unittest.cc b/net/base/mapped_host_resolver_unittest.cc

index e24fca381a9423a93fbbf970ff57d7bc9a12d7a7..7e691beb57383cedec900f10f5aa243548fcef4b 100644

--- a/net/base/mapped_host_resolver_unittest.cc

+++ b/net/base/mapped_host_resolver_unittest.cc

@@ -33,10 +33,11 @@ TEST(MappedHostResolverTest, Inclusion) {

// Try resolving "www.google.com:80". There are no mappings yet, so this

// hits |resolver_impl| and fails.

- TestOldCompletionCallback callback;

+ TestCompletionCallback callback;

rv = resolver->Resolve(HostResolver::RequestInfo(

HostPortPair("www.google.com", 80)),

- &address_list, &callback, NULL, BoundNetLog());

+ &address_list, callback.callback(), NULL,

+ BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

rv = callback.WaitForResult();

EXPECT_EQ(ERR_NAME_NOT_RESOLVED, rv);

@@ -47,7 +48,8 @@ TEST(MappedHostResolverTest, Inclusion) {

// Try resolving "www.google.com:80". Should be remapped to "baz.com:80".

rv = resolver->Resolve(HostResolver::RequestInfo(

HostPortPair("www.google.com", 80)),

- &address_list, &callback, NULL, BoundNetLog());

+ &address_list, callback.callback(), NULL,

+ BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

rv = callback.WaitForResult();

EXPECT_EQ(OK, rv);

@@ -57,7 +59,8 @@ TEST(MappedHostResolverTest, Inclusion) {

// Try resolving "foo.com:77". This will NOT be remapped, so result

// is "foo.com:77".

rv = resolver->Resolve(HostResolver::RequestInfo(HostPortPair("foo.com", 77)),

- &address_list, &callback, NULL, BoundNetLog());

+ &address_list, callback.callback(), NULL,

+ BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

rv = callback.WaitForResult();

EXPECT_EQ(OK, rv);

@@ -70,7 +73,8 @@ TEST(MappedHostResolverTest, Inclusion) {

// Try resolving "chromium.org:61". Should be remapped to "proxy:99".

rv = resolver->Resolve(HostResolver::RequestInfo

(HostPortPair("chromium.org", 61)),

- &address_list, &callback, NULL, BoundNetLog());

+ &address_list, callback.callback(), NULL,

+ BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

rv = callback.WaitForResult();

EXPECT_EQ(OK, rv);

@@ -91,7 +95,7 @@ TEST(MappedHostResolverTest, Exclusion) {

int rv;

AddressList address_list;

- TestOldCompletionCallback callback;

+ TestCompletionCallback callback;

// Remap "*.com" to "baz".

EXPECT_TRUE(resolver->AddRuleFromString("map *.com baz"));

@@ -102,7 +106,8 @@ TEST(MappedHostResolverTest, Exclusion) {

// Try resolving "www.google.com". Should not be remapped due to exclusion).

rv = resolver->Resolve(HostResolver::RequestInfo(

HostPortPair("www.google.com", 80)),

- &address_list, &callback, NULL, BoundNetLog());

+ &address_list, callback.callback(), NULL,

+ BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

rv = callback.WaitForResult();

EXPECT_EQ(OK, rv);

@@ -112,7 +117,8 @@ TEST(MappedHostResolverTest, Exclusion) {

// Try resolving "chrome.com:80". Should be remapped to "baz:80".

rv = resolver->Resolve(HostResolver::RequestInfo(

HostPortPair("chrome.com", 80)),

- &address_list, &callback, NULL, BoundNetLog());

+ &address_list, callback.callback(), NULL,

+ BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

rv = callback.WaitForResult();

EXPECT_EQ(OK, rv);

@@ -132,7 +138,7 @@ TEST(MappedHostResolverTest, SetRulesFromString) {

int rv;

AddressList address_list;

- TestOldCompletionCallback callback;

+ TestCompletionCallback callback;

// Remap "*.com" to "baz", and *.net to "bar:60".

resolver->SetRulesFromString("map *.com baz , map *.net bar:60");

@@ -140,7 +146,8 @@ TEST(MappedHostResolverTest, SetRulesFromString) {

// Try resolving "www.google.com". Should be remapped to "baz".

rv = resolver->Resolve(HostResolver::RequestInfo(

HostPortPair("www.google.com", 80)),

- &address_list, &callback, NULL, BoundNetLog());

+ &address_list, callback.callback(), NULL,

+ BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

rv = callback.WaitForResult();

EXPECT_EQ(OK, rv);

@@ -150,7 +157,8 @@ TEST(MappedHostResolverTest, SetRulesFromString) {

// Try resolving "chrome.net:80". Should be remapped to "bar:60".

rv = resolver->Resolve(HostResolver::RequestInfo(

HostPortPair("chrome.net", 80)),

- &address_list, &callback, NULL, BoundNetLog());

+ &address_list, callback.callback(), NULL,

+ BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

rv = callback.WaitForResult();

EXPECT_EQ(OK, rv);

« net/base/mapped_host_resolver.cc ('K') | « net/base/mapped_host_resolver.cc ('k') | net/base/mock_host_resolver.h » ('j') | no next file with comments »