Adds custom ttl argument to HostCache::Set.

net/base/mock_host_resolver.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/mock_host_resolver.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 112 matching lines @@
   return cache_.get();
 }
 
 // start id from 1 to distinguish from NULL RequestHandle
 MockHostResolverBase::MockHostResolverBase(bool use_caching)
     : synchronous_mode_(false), next_request_id_(1) {
   rules_ = CreateCatchAllHostResolverProc();
   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 TTLs) at top of file, in
anonymous namespace, as is done in most other files.  Seems a good idea to do it
where they appear in the other two files, too, while you're are it.

   }
 }
 
 int MockHostResolverBase::ResolveFromIPLiteralOrCache(const RequestInfo& info,
                                                       AddressList* addresses) {
   IPAddressNumber ip;
   if (ParseIPLiteralToNumber(info.hostname(), &ip)) {
     *addresses = AddressList::CreateFromIPAddressWithCname(
         ip, info.port(), info.host_resolver_flags() & HOST_RESOLVER_CANONNAME);
     return OK;
@@ skipping 15 matching lines @@
 
 int MockHostResolverBase::ResolveProc(size_t id,
                                       const RequestInfo& info,
                                       AddressList* addresses) {
   AddressList addr;
   int rv = proc_->Resolve(info.hostname(),
                           info.address_family(),
                           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;
 }
 
 void MockHostResolverBase::ResolveNow(size_t id) {
   RequestMap::iterator it = requests_.find(id);
   if (it == requests_.end())
     return;  // was canceled
 
   scoped_ptr<Request> req(it->second);
   requests_.erase(it);
@@ skipping 201 matching lines @@
   CHECK_EQ(old_proc, current_proc_);
 }
 
 void ScopedDefaultHostResolverProc::Init(HostResolverProc* proc) {
   current_proc_ = proc;
   previous_proc_ = HostResolverProc::SetDefault(current_proc_);
   current_proc_->SetLastProc(previous_proc_);
 }
 
 }  // namespace net