Index: net/base/mapped_host_resolver_unittest.cc |
=================================================================== |
--- net/base/mapped_host_resolver_unittest.cc (revision 41560) |
+++ net/base/mapped_host_resolver_unittest.cc (working copy) |
@@ -6,6 +6,7 @@ |
#include "net/base/mock_host_resolver.h" |
#include "net/base/net_errors.h" |
+#include "net/base/net_log.h" |
#include "net/base/net_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -31,7 +32,7 @@ |
// Try resolving "www.google.com:80". There are no mappings yet, so this |
// hits |resolver_impl| and fails. |
rv = resolver->Resolve(HostResolver::RequestInfo("www.google.com", 80), |
- &address_list, NULL, NULL, NULL); |
+ &address_list, NULL, NULL, BoundNetLog()); |
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, rv); |
// Remap *.google.com to baz.com. |
@@ -39,7 +40,7 @@ |
// Try resolving "www.google.com:80". Should be remapped to "baz.com:80". |
rv = resolver->Resolve(HostResolver::RequestInfo("www.google.com", 80), |
- &address_list, NULL, NULL, NULL); |
+ &address_list, NULL, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("192.168.1.5", NetAddressToString(address_list.head())); |
EXPECT_EQ(80, address_list.GetPort()); |
@@ -47,7 +48,7 @@ |
// Try resolving "foo.com:77". This will NOT be remapped, so result |
// is "foo.com:77". |
rv = resolver->Resolve(HostResolver::RequestInfo("foo.com", 77), |
- &address_list, NULL, NULL, NULL); |
+ &address_list, NULL, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("192.168.1.8", NetAddressToString(address_list.head())); |
EXPECT_EQ(77, address_list.GetPort()); |
@@ -57,7 +58,7 @@ |
// Try resolving "chromium.org:61". Should be remapped to "proxy:99". |
rv = resolver->Resolve(HostResolver::RequestInfo("chromium.org", 61), |
- &address_list, NULL, NULL, NULL); |
+ &address_list, NULL, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("192.168.1.11", NetAddressToString(address_list.head())); |
EXPECT_EQ(99, address_list.GetPort()); |
@@ -85,14 +86,14 @@ |
// Try resolving "www.google.com". Should not be remapped due to exclusion). |
rv = resolver->Resolve(HostResolver::RequestInfo("www.google.com", 80), |
- &address_list, NULL, NULL, NULL); |
+ &address_list, NULL, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("192.168.1.3", NetAddressToString(address_list.head())); |
EXPECT_EQ(80, address_list.GetPort()); |
// Try resolving "chrome.com:80". Should be remapped to "baz:80". |
rv = resolver->Resolve(HostResolver::RequestInfo("chrome.com", 80), |
- &address_list, NULL, NULL, NULL); |
+ &address_list, NULL, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("192.168.1.5", NetAddressToString(address_list.head())); |
EXPECT_EQ(80, address_list.GetPort()); |
@@ -116,14 +117,14 @@ |
// Try resolving "www.google.com". Should be remapped to "baz". |
rv = resolver->Resolve(HostResolver::RequestInfo("www.google.com", 80), |
- &address_list, NULL, NULL, NULL); |
+ &address_list, NULL, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("192.168.1.7", NetAddressToString(address_list.head())); |
EXPECT_EQ(80, address_list.GetPort()); |
// Try resolving "chrome.net:80". Should be remapped to "bar:60". |
rv = resolver->Resolve(HostResolver::RequestInfo("chrome.net", 80), |
- &address_list, NULL, NULL, NULL); |
+ &address_list, NULL, NULL, BoundNetLog()); |
EXPECT_EQ(OK, rv); |
EXPECT_EQ("192.168.1.9", NetAddressToString(address_list.head())); |
EXPECT_EQ(60, address_list.GetPort()); |