Revert 118489 since it seems to regress linux-sizes.

"""
Adds custom ttl argument to HostCache::Set.

BUG=25472,107880
TEST=net_unittests


Review URL: http://codereview.chromium.org/9197009

TBR=szym@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9138039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118512 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 11 deletions

diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
index 7af8f14..612c600 100644
--- a/net/base/mock_host_resolver.cc
+++ b/net/base/mock_host_resolver.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -22,11 +22,6 @@ namespace net {
 
 namespace {
 
-// Cache size for the MockCachingHostResolver.
-const unsigned kMaxCacheEntries = 100;
-// TTL for the successful resolutions. Failures are not cached.
-const base::TimeDelta kCacheEntryTTL = base::TimeDelta::FromMinutes(1);
-
 char* do_strdup(const char* src) {
 #if defined(OS_WIN)
   return _strdup(src);
@@ -135,7 +130,10 @@ MockHostResolverBase::MockHostResolverBase(bool use_caching)
   proc_ = rules_;
 
   if (use_caching) {
-    cache_.reset(new HostCache(kMaxCacheEntries));
+    cache_.reset(new HostCache(
+        100,  // max entries.
+        base::TimeDelta::FromMinutes(1),
+        base::TimeDelta::FromSeconds(0)));
   }
 }
 
@@ -175,10 +173,7 @@ int MockHostResolverBase::ResolveProc(size_t id,
     HostCache::Key key(info.hostname(),
                        info.address_family(),
                        info.host_resolver_flags());
-    // Storing a failure with TTL 0 so that it overwrites previous value.
-    cache_->Set(key, rv, addr,
-                base::TimeTicks::Now(),
-                (rv == OK) ? kCacheEntryTTL : base::TimeDelta());
+    cache_->Set(key, rv, addr, base::TimeTicks::Now());
   }
   if (rv == OK)
     *addresses = CreateAddressListUsingPort(addr, info.port());