Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: net/base/host_cache.h

Issue 1629005: Revert 43826 - HostResolver now adds AI_CANONNAME to the hint flags if a requ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/address_list_unittest.cc ('k') | net/base/host_cache_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/host_cache.h
===================================================================
--- net/base/host_cache.h (revision 43832)
+++ net/base/host_cache.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
@@ -37,29 +37,22 @@
};
struct Key {
- Key(const std::string& hostname, AddressFamily address_family,
- HostResolverFlags host_resolver_flags)
- : hostname(hostname),
- address_family(address_family),
- host_resolver_flags(host_resolver_flags) {}
+ Key(const std::string& hostname, AddressFamily address_family)
+ : hostname(hostname), address_family(address_family) {}
bool operator==(const Key& other) const {
- return (other.address_family == address_family &&
- other.host_resolver_flags == host_resolver_flags &&
- other.hostname == hostname);
+ return other.hostname == hostname &&
+ other.address_family == address_family;
}
bool operator<(const Key& other) const {
- if (address_family != other.address_family)
- return address_family < other.address_family;
- if (host_resolver_flags != other.host_resolver_flags)
- return host_resolver_flags < other.host_resolver_flags;
- return hostname < other.hostname;
+ if (address_family == other.address_family)
+ return hostname < other.hostname;
+ return address_family < other.address_family;
}
std::string hostname;
AddressFamily address_family;
- HostResolverFlags host_resolver_flags;
};
typedef std::map<Key, scoped_refptr<Entry> > EntryMap;
« no previous file with comments | « net/base/address_list_unittest.cc ('k') | net/base/host_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698