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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/dns/mapped_host_resolver_unittest.cc

Issue 2116983002: Change HostResolver::Resolve() to take an std::unique_ptr<Request>* rather than a RequestHandle* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: http_stream_factory_impl_job_controller_unittest RequestHandle* to unique_ptr Created 4 years, 5 months 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
« no previous file with comments | « net/dns/mapped_host_resolver.cc ('k') | net/dns/mock_host_resolver.h » ('j') | net/proxy/proxy_resolver_v8_tracing.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/mapped_host_resolver_unittest.cc
diff --git a/net/dns/mapped_host_resolver_unittest.cc b/net/dns/mapped_host_resolver_unittest.cc
index 65332f2a8df2354d48ea137bb132a18ffe9c2b59..3c3b479aa3463ac029317b44825cbd496ef47510 100644
--- a/net/dns/mapped_host_resolver_unittest.cc
+++ b/net/dns/mapped_host_resolver_unittest.cc
@@ -29,6 +29,8 @@ std::string FirstAddress(const AddressList& address_list) {
}
TEST(MappedHostResolverTest, Inclusion) {
+ // Outstanding request.
+ std::unique_ptr<HostResolver::Request> request;
// Create a mock host resolver, with specific hostname to IP mappings.
std::unique_ptr<MockHostResolver> resolver_impl(new MockHostResolver());
resolver_impl->rules()->AddSimulatedFailure("*google.com");
@@ -48,10 +50,7 @@ TEST(MappedHostResolverTest, Inclusion) {
TestCompletionCallback callback;
rv = resolver->Resolve(
HostResolver::RequestInfo(HostPortPair("www.google.com", 80)),
- DEFAULT_PRIORITY,
- &address_list,
- callback.callback(),
- NULL,
+ DEFAULT_PRIORITY, &address_list, callback.callback(), &request,
BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
@@ -59,32 +58,29 @@ TEST(MappedHostResolverTest, Inclusion) {
// Remap *.google.com to baz.com.
EXPECT_TRUE(resolver->AddRuleFromString("map *.google.com baz.com"));
+ request.reset();
// Try resolving "www.google.com:80". Should be remapped to "baz.com:80".
rv = resolver->Resolve(
HostResolver::RequestInfo(HostPortPair("www.google.com", 80)),
- DEFAULT_PRIORITY,
- &address_list,
- callback.callback(),
- NULL,
+ DEFAULT_PRIORITY, &address_list, callback.callback(), &request,
BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
EXPECT_THAT(rv, IsOk());
EXPECT_EQ("192.168.1.5:80", FirstAddress(address_list));
+ request.reset();
// 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)),
- DEFAULT_PRIORITY,
- &address_list,
- callback.callback(),
- NULL,
- BoundNetLog());
+ DEFAULT_PRIORITY, &address_list, callback.callback(),
+ &request, BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
EXPECT_THAT(rv, IsOk());
EXPECT_EQ("192.168.1.8:77", FirstAddress(address_list));
+ request.reset();
// Remap "*.org" to "proxy:99".
EXPECT_TRUE(resolver->AddRuleFromString("Map *.org proxy:99"));
@@ -92,10 +88,7 @@ TEST(MappedHostResolverTest, Inclusion) {
// Try resolving "chromium.org:61". Should be remapped to "proxy:99".
rv = resolver->Resolve(
HostResolver::RequestInfo(HostPortPair("chromium.org", 61)),
- DEFAULT_PRIORITY,
- &address_list,
- callback.callback(),
- NULL,
+ DEFAULT_PRIORITY, &address_list, callback.callback(), &request,
BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
@@ -105,6 +98,8 @@ TEST(MappedHostResolverTest, Inclusion) {
// Tests that exclusions are respected.
TEST(MappedHostResolverTest, Exclusion) {
+ // Outstanding request.
+ std::unique_ptr<HostResolver::Request> request;
// Create a mock host resolver, with specific hostname to IP mappings.
std::unique_ptr<MockHostResolver> resolver_impl(new MockHostResolver());
resolver_impl->rules()->AddRule("baz", "192.168.1.5");
@@ -127,23 +122,18 @@ 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)),
- DEFAULT_PRIORITY,
- &address_list,
- callback.callback(),
- NULL,
+ DEFAULT_PRIORITY, &address_list, callback.callback(), &request,
BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
EXPECT_THAT(rv, IsOk());
EXPECT_EQ("192.168.1.3:80", FirstAddress(address_list));
+ request.reset();
// Try resolving "chrome.com:80". Should be remapped to "baz:80".
rv = resolver->Resolve(
HostResolver::RequestInfo(HostPortPair("chrome.com", 80)),
- DEFAULT_PRIORITY,
- &address_list,
- callback.callback(),
- NULL,
+ DEFAULT_PRIORITY, &address_list, callback.callback(), &request,
BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
@@ -152,6 +142,8 @@ TEST(MappedHostResolverTest, Exclusion) {
}
TEST(MappedHostResolverTest, SetRulesFromString) {
+ // Outstanding request.
+ std::unique_ptr<HostResolver::Request> request;
// Create a mock host resolver, with specific hostname to IP mappings.
std::unique_ptr<MockHostResolver> resolver_impl(new MockHostResolver());
resolver_impl->rules()->AddRule("baz", "192.168.1.7");
@@ -171,23 +163,18 @@ TEST(MappedHostResolverTest, SetRulesFromString) {
// Try resolving "www.google.com". Should be remapped to "baz".
rv = resolver->Resolve(
HostResolver::RequestInfo(HostPortPair("www.google.com", 80)),
- DEFAULT_PRIORITY,
- &address_list,
- callback.callback(),
- NULL,
+ DEFAULT_PRIORITY, &address_list, callback.callback(), &request,
BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
EXPECT_THAT(rv, IsOk());
EXPECT_EQ("192.168.1.7:80", FirstAddress(address_list));
+ request.reset();
// Try resolving "chrome.net:80". Should be remapped to "bar:60".
rv = resolver->Resolve(
HostResolver::RequestInfo(HostPortPair("chrome.net", 80)),
- DEFAULT_PRIORITY,
- &address_list,
- callback.callback(),
- NULL,
+ DEFAULT_PRIORITY, &address_list, callback.callback(), &request,
BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback.WaitForResult();
@@ -212,6 +199,8 @@ TEST(MappedHostResolverTest, ParseInvalidRules) {
// Test mapping hostnames to resolving failures.
TEST(MappedHostResolverTest, MapToError) {
+ // Outstanding request.
+ std::unique_ptr<HostResolver::Request> request;
std::unique_ptr<MockHostResolver> resolver_impl(new MockHostResolver());
resolver_impl->rules()->AddRule("*", "192.168.1.5");
@@ -228,21 +217,16 @@ TEST(MappedHostResolverTest, MapToError) {
TestCompletionCallback callback1;
rv = resolver->Resolve(
HostResolver::RequestInfo(HostPortPair("www.google.com", 80)),
- DEFAULT_PRIORITY,
- &address_list,
- callback1.callback(),
- NULL,
+ DEFAULT_PRIORITY, &address_list, callback1.callback(), &request,
BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_NAME_NOT_RESOLVED));
+ request.reset();
// Try resolving www.foo.com --> Should succeed.
TestCompletionCallback callback2;
rv = resolver->Resolve(
HostResolver::RequestInfo(HostPortPair("www.foo.com", 80)),
- DEFAULT_PRIORITY,
- &address_list,
- callback2.callback(),
- NULL,
+ DEFAULT_PRIORITY, &address_list, callback2.callback(), &request,
BoundNetLog());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
rv = callback2.WaitForResult();
« no previous file with comments | « net/dns/mapped_host_resolver.cc ('k') | net/dns/mock_host_resolver.h » ('j') | net/proxy/proxy_resolver_v8_tracing.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698