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

Unified Diff: net/dns/dns_hosts.h

Issue 992733002: Remove //net (except for Android test stuff) and sdch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 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/dns/dns_config_watcher_mac.cc ('k') | net/dns/dns_hosts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/dns_hosts.h
diff --git a/net/dns/dns_hosts.h b/net/dns/dns_hosts.h
deleted file mode 100644
index 8ee6d87ecb932df22e3c15b677310dcb7f9f5fa6..0000000000000000000000000000000000000000
--- a/net/dns/dns_hosts.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) 2012 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_DNS_DNS_HOSTS_H_
-#define NET_DNS_DNS_HOSTS_H_
-
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/containers/hash_tables.h"
-#include "base/files/file_path.h"
-#include "net/base/address_family.h"
-#include "net/base/net_export.h"
-#include "net/base/net_util.h" // can't forward-declare IPAddressNumber
-
-namespace net {
- typedef std::pair<std::string, AddressFamily> DnsHostsKey;
-};
-
-namespace BASE_HASH_NAMESPACE {
-
-template<>
-struct hash<net::DnsHostsKey> {
- std::size_t operator()(const net::DnsHostsKey& key) const {
- hash<base::StringPiece> string_piece_hash;
- return string_piece_hash(key.first) + key.second;
- }
-};
-
-} // namespace BASE_HASH_NAMESPACE
-
-namespace net {
-
-// There are OS-specific variations in how commas in the hosts file behave.
-enum ParseHostsCommaMode {
- // Comma is treated as part of a hostname:
- // "127.0.0.1 foo,bar" parses as "foo,bar" mapping to "127.0.0.1".
- PARSE_HOSTS_COMMA_IS_TOKEN,
-
- // Comma is treated as a hostname separator:
- // "127.0.0.1 foo,bar" parses as "foo" and "bar" both mapping to "127.0.0.1".
- PARSE_HOSTS_COMMA_IS_WHITESPACE,
-};
-
-// Parsed results of a Hosts file.
-//
-// Although Hosts files map IP address to a list of domain names, for name
-// resolution the desired mapping direction is: domain name to IP address.
-// When parsing Hosts, we apply the "first hit" rule as Windows and glibc do.
-// With a Hosts file of:
-// 300.300.300.300 localhost # bad ip
-// 127.0.0.1 localhost
-// 10.0.0.1 localhost
-// The expected resolution of localhost is 127.0.0.1.
-#if !defined(OS_ANDROID)
-typedef base::hash_map<DnsHostsKey, IPAddressNumber> DnsHosts;
-#else
-// Android's hash_map doesn't support ==, so fall back to map. (Chromium on
-// Android doesn't use the built-in DNS resolver anyway, so it's irrelevant.)
-typedef std::map<DnsHostsKey, IPAddressNumber> DnsHosts;
-#endif
-
-// Parses |contents| (as read from /etc/hosts or equivalent) and stores results
-// in |dns_hosts|. Invalid lines are ignored (as in most implementations).
-// Overrides the OS-specific default handling of commas, so unittests can test
-// both modes.
-void NET_EXPORT_PRIVATE ParseHostsWithCommaModeForTesting(
- const std::string& contents,
- DnsHosts* dns_hosts,
- ParseHostsCommaMode comma_mode);
-
-// Parses |contents| (as read from /etc/hosts or equivalent) and stores results
-// in |dns_hosts|. Invalid lines are ignored (as in most implementations).
-void NET_EXPORT_PRIVATE ParseHosts(const std::string& contents,
- DnsHosts* dns_hosts);
-
-// As above but reads the file pointed to by |path|.
-bool NET_EXPORT_PRIVATE ParseHostsFile(const base::FilePath& path,
- DnsHosts* dns_hosts);
-
-
-
-} // namespace net
-
-#endif // NET_DNS_DNS_HOSTS_H_
-
« no previous file with comments | « net/dns/dns_config_watcher_mac.cc ('k') | net/dns/dns_hosts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698