Chromium Code Reviews| Index: net/base/mock_host_resolver.cc |
| diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc |
| index 612c6007a48d1f076ee3058552c04ebb498e841d..bc5b85f12aebee3d80e8a770345fa20d6bad828b 100644 |
| --- a/net/base/mock_host_resolver.cc |
| +++ b/net/base/mock_host_resolver.cc |
| @@ -130,10 +130,7 @@ MockHostResolverBase::MockHostResolverBase(bool use_caching) |
| proc_ = rules_; |
| if (use_caching) { |
| - cache_.reset(new HostCache( |
| - 100, // max entries. |
| - base::TimeDelta::FromMinutes(1), |
| - base::TimeDelta::FromSeconds(0))); |
| + cache_.reset(new HostCache(100 /* max entries */)); |
|
mmenke
2012/01/19 22:12:43
nit: Suggest you put both constants (this and TTL
|
| } |
| } |
| @@ -169,14 +166,18 @@ int MockHostResolverBase::ResolveProc(size_t id, |
| info.host_resolver_flags(), |
| &addr, |
| NULL); |
| + if (rv != OK) |
| + return rv; |
| + |
| if (cache_.get()) { |
| HostCache::Key key(info.hostname(), |
| info.address_family(), |
| info.host_resolver_flags()); |
| - cache_->Set(key, rv, addr, base::TimeTicks::Now()); |
| + cache_->Set(key, rv, addr, |
| + base::TimeDelta::FromMinutes(1), |
| + base::TimeTicks::Now()); |
| } |
| - if (rv == OK) |
| - *addresses = CreateAddressListUsingPort(addr, info.port()); |
| + *addresses = CreateAddressListUsingPort(addr, info.port()); |
| return rv; |
| } |