Index: net/base/host_resolver_impl_unittest.cc |
diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc |
index 9a299c1da2769957a5fffdbfe9e65256acb4c8b8..93d2950a4b7eb0e3ab1545342e6596ac1a177031 100644 |
--- a/net/base/host_resolver_impl_unittest.cc |
+++ b/net/base/host_resolver_impl_unittest.cc |
@@ -51,6 +51,7 @@ HostResolverImpl* CreateHostResolverImpl(HostResolverProc* resolver_proc) { |
HostCache::CreateDefaultCache(), |
DefaultLimits(), |
DefaultParams(resolver_proc), |
+ scoped_ptr<DnsConfigService>(NULL), |
NULL); |
} |
@@ -65,6 +66,7 @@ HostResolverImpl* CreateSerialHostResolverImpl( |
return new HostResolverImpl(HostCache::CreateDefaultCache(), |
limits, |
params, |
+ scoped_ptr<DnsConfigService>(NULL), |
NULL); |
} |
@@ -434,8 +436,7 @@ TEST_F(HostResolverImplTest, FailedAsynchronousLookup) { |
new RuleBasedHostResolverProc(NULL)); |
resolver_proc->AddSimulatedFailure("just.testing"); |
- scoped_ptr<HostResolver> host_resolver( |
- CreateHostResolverImpl(resolver_proc)); |
+ scoped_ptr<HostResolver> host_resolver(CreateHostResolverImpl(resolver_proc)); |
HostResolver::RequestInfo info(HostPortPair("just.testing", kPortnum)); |
CapturingBoundNetLog log(CapturingNetLog::kUnbounded); |
@@ -518,6 +519,7 @@ TEST_F(HostResolverImplTest, AbortedAsynchronousLookup) { |
new HostResolverImpl(HostCache::CreateDefaultCache(), |
DefaultLimits(), |
DefaultParams(resolver_proc), |
+ scoped_ptr<DnsConfigService>(NULL), |
&net_log)); |
AddressList addrlist; |
const int kPortnum = 80; |
@@ -553,20 +555,17 @@ TEST_F(HostResolverImplTest, AbortedAsynchronousLookup) { |
pos = ExpectLogContainsSomewhereAfter(net_log_entries, pos + 1, |
NetLog::TYPE_HOST_RESOLVER_IMPL_PROC_TASK, |
NetLog::PHASE_BEGIN); |
- // Both Request and ProcTask need to be cancelled. (The Job is "aborted".) |
- pos = ExpectLogContainsSomewhereAfter(net_log_entries, pos + 1, |
- NetLog::TYPE_CANCELLED, |
- NetLog::PHASE_NONE); |
- // Don't care about order in which Request, Job and ProcTask end, or when the |
- // other one is cancelled. |
+ |
+ // The Request needs to be cancelled. (The Job is "aborted".) |
+ // Don't care about order in which Request, Job and ProcTask end. |
ExpectLogContainsSomewhereAfter(net_log_entries, pos + 1, |
NetLog::TYPE_CANCELLED, |
NetLog::PHASE_NONE); |
ExpectLogContainsSomewhereAfter(net_log_entries, pos + 1, |
- NetLog::TYPE_HOST_RESOLVER_IMPL_REQUEST, |
+ NetLog::TYPE_HOST_RESOLVER_IMPL_PROC_TASK, |
NetLog::PHASE_END); |
ExpectLogContainsSomewhereAfter(net_log_entries, pos + 1, |
- NetLog::TYPE_HOST_RESOLVER_IMPL_PROC_TASK, |
+ NetLog::TYPE_HOST_RESOLVER_IMPL_REQUEST, |
NetLog::PHASE_END); |
ExpectLogContainsSomewhereAfter(net_log_entries, pos + 1, |
NetLog::TYPE_HOST_RESOLVER_IMPL_JOB, |
@@ -973,7 +972,11 @@ TEST_F(HostResolverImplTest, StartWithinCallback) { |
// Turn off caching for this host resolver. |
scoped_ptr<HostResolver> host_resolver(new HostResolverImpl( |
- NULL, DefaultLimits(), DefaultParams(resolver_proc), NULL)); |
+ NULL, |
+ DefaultLimits(), |
+ DefaultParams(resolver_proc), |
+ scoped_ptr<DnsConfigService>(NULL), |
+ NULL)); |
// The class will receive callbacks for when each resolve completes. It |
// checks that the right things happened. |
@@ -1575,7 +1578,7 @@ TEST_F(HostResolverImplTest, MultipleAttempts) { |
new LookupAttemptHostResolverProc( |
NULL, kAttemptNumberToResolve, kTotalAttempts)); |
- HostResolverImpl::ProcTaskParams params = DefaultParams(resolver_proc); |
+ HostResolverImpl::ProcTaskParams params = DefaultParams(resolver_proc.get()); |
// Specify smaller interval for unresponsive_delay_ for HostResolverImpl so |
// that unit test runs faster. For example, this test finishes in 1.5 secs |
@@ -1586,6 +1589,7 @@ TEST_F(HostResolverImplTest, MultipleAttempts) { |
new HostResolverImpl(HostCache::CreateDefaultCache(), |
DefaultLimits(), |
params, |
+ scoped_ptr<DnsConfigService>(NULL), |
NULL)); |
// Resolve "host1". |