Mark HostCache as NonThreadSafe.

net/base/host_cache.h

 // Copyright (c) 2010 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.
 
 #ifndef NET_BASE_HOST_CACHE_H_
 #define NET_BASE_HOST_CACHE_H_
 
 #include <map>
 #include <string>
 
+#include "base/non_thread_safe.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
 #include "net/base/address_family.h"
 #include "net/base/address_list.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace net {
 
 // Cache used by HostResolver to map hostnames to their resolved result.
-class HostCache {
+class HostCache : public NonThreadSafe {
  public:
   // Stores the latest address list that was looked up for a hostname.
   struct Entry : public base::RefCounted<Entry> {
     Entry(int error, const AddressList& addrlist, base::TimeTicks expiration);
 
     // The resolve results for this entry.
     int error;
     AddressList addrlist;
 
     // The time when this entry expires.
@@ skipping 54 matching lines @@
 
   // Overwrites or creates an entry for |key|. Returns the pointer to the
   // entry, or NULL on failure (fails if caching is disabled).
   // (|error|, |addrlist|) is the value to set, and |now| is the current
   // timestamp.
   Entry* Set(const Key& key,
              int error,
              const AddressList addrlist,
              base::TimeTicks now);
 
-  // Empties the cache.
-  void clear() {
-    entries_.clear();
-  }
-
-  // Returns true if this HostCache can contain no entries.
-  bool caching_is_disabled() const {
-    return max_entries_ == 0;
-  }
+  // Empties the cache
+  void clear();
 
   // Returns the number of entries in the cache.
-  size_t size() const {
-    return entries_.size();
-  }
+  size_t size() const;
 
-  size_t max_entries() const {
-    return max_entries_;
-  }
+  // Following are used by net_internals UI.
+  size_t max_entries() const;
 
-  base::TimeDelta success_entry_ttl() const {
-    return success_entry_ttl_;
-  }
+  base::TimeDelta success_entry_ttl() const;
 
-  base::TimeDelta failure_entry_ttl() const {
-    return failure_entry_ttl_;
-  }
+  base::TimeDelta failure_entry_ttl() const;
 
   // Note that this map may contain expired entries.
-  const EntryMap& entries() const {
-    return entries_;
-  }
+  const EntryMap& entries() const;
 
  private:
   FRIEND_TEST(HostCacheTest, Compact);
   FRIEND_TEST(HostCacheTest, NoCache);

[willchan no longer on Chromium, 2010/06/08 20:24:22]

Was this \n deletion intentional?  Up to you, but it seemed to make sense to me
to have it.

[cbentzel, 2010/06/09 18:01:29]

Unintentional, thanks for the catch.

-
   // Returns true if this cache entry's result is valid at time |now|.
   static bool CanUseEntry(const Entry* entry, const base::TimeTicks now);
 
   // Prunes entries from the cache to bring it below max entry bound. Entries
   // matching |pinned_entry| will NOT be pruned.
   void Compact(base::TimeTicks now, const Entry* pinned_entry);
 
+  // Returns true if this HostCache can contain no entries.
+  bool caching_is_disabled() const {
+    return max_entries_ == 0;
+  }
+
   // Bound on total size of the cache.
   size_t max_entries_;
 
   // Time to live for cache entries.
   base::TimeDelta success_entry_ttl_;
   base::TimeDelta failure_entry_ttl_;
 
   // Map from hostname (presumably in lowercase canonicalized format) to
   // a resolved result entry.
   EntryMap entries_;
 
   DISALLOW_COPY_AND_ASSIGN(HostCache);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_HOST_CACHE_H_