| Index: net/dns/dns_config_service.cc
|
| diff --git a/net/dns/dns_config_service.cc b/net/dns/dns_config_service.cc
|
| index bfa4b8db84e648393eecfd4ce8a4d82ff6afcce7..75d54318936d8713dce4c515e830c18c032f618f 100644
|
| --- a/net/dns/dns_config_service.cc
|
| +++ b/net/dns/dns_config_service.cc
|
| @@ -18,10 +18,11 @@ NameServerClassifier::NameServerClassifier() {
|
| AddRule("8.8.8.8", NAME_SERVERS_TYPE_GOOGLE_PUBLIC_DNS);
|
| AddRule("8.8.4.4", NAME_SERVERS_TYPE_GOOGLE_PUBLIC_DNS);
|
| AddRule("2001:4860:4860:0:0:0:0:8888", NAME_SERVERS_TYPE_GOOGLE_PUBLIC_DNS),
|
| - AddRule("2001:4860:4860:0:0:0:0:8844", NAME_SERVERS_TYPE_GOOGLE_PUBLIC_DNS),
|
| + AddRule("2001:4860:4860:0:0:0:0:8844",
|
| + NAME_SERVERS_TYPE_GOOGLE_PUBLIC_DNS),
|
|
|
| - // Count localhost as private, since we don't know what upstream it uses:
|
| - AddRule("127.*.*.*", NAME_SERVERS_TYPE_PRIVATE);
|
| + // Count localhost as private, since we don't know what upstream it uses:
|
| + AddRule("127.*.*.*", NAME_SERVERS_TYPE_PRIVATE);
|
| AddRule("0:0:0:0:0:0:0:1", NAME_SERVERS_TYPE_PRIVATE);
|
|
|
| // RFC 1918 private addresses:
|
| @@ -40,7 +41,8 @@ NameServerClassifier::NameServerClassifier() {
|
| AddRule("*:*:*:*:*:*:*:*", NAME_SERVERS_TYPE_PUBLIC);
|
| }
|
|
|
| -NameServerClassifier::~NameServerClassifier() {}
|
| +NameServerClassifier::~NameServerClassifier() {
|
| +}
|
|
|
| NameServerClassifier::NameServersType NameServerClassifier::GetNameServersType(
|
| const std::vector<IPEndPoint>& nameservers) const {
|
| @@ -104,25 +106,23 @@ DnsConfig::DnsConfig()
|
| attempts(2),
|
| rotate(false),
|
| edns0(false),
|
| - use_local_ipv6(false) {}
|
| + use_local_ipv6(false) {
|
| +}
|
|
|
| -DnsConfig::~DnsConfig() {}
|
| +DnsConfig::~DnsConfig() {
|
| +}
|
|
|
| bool DnsConfig::Equals(const DnsConfig& d) const {
|
| return EqualsIgnoreHosts(d) && (hosts == d.hosts);
|
| }
|
|
|
| bool DnsConfig::EqualsIgnoreHosts(const DnsConfig& d) const {
|
| - return (nameservers == d.nameservers) &&
|
| - (search == d.search) &&
|
| + return (nameservers == d.nameservers) && (search == d.search) &&
|
| (unhandled_options == d.unhandled_options) &&
|
| (append_to_multi_label_name == d.append_to_multi_label_name) &&
|
| - (ndots == d.ndots) &&
|
| - (timeout == d.timeout) &&
|
| - (attempts == d.attempts) &&
|
| - (rotate == d.rotate) &&
|
| - (edns0 == d.edns0) &&
|
| - (use_local_ipv6 == d.use_local_ipv6);
|
| + (ndots == d.ndots) && (timeout == d.timeout) &&
|
| + (attempts == d.attempts) && (rotate == d.rotate) &&
|
| + (edns0 == d.edns0) && (use_local_ipv6 == d.use_local_ipv6);
|
| }
|
|
|
| void DnsConfig::CopyIgnoreHosts(const DnsConfig& d) {
|
| @@ -164,13 +164,13 @@ base::Value* DnsConfig::ToValue() const {
|
| return dict;
|
| }
|
|
|
| -
|
| DnsConfigService::DnsConfigService()
|
| : watch_failed_(false),
|
| have_config_(false),
|
| have_hosts_(false),
|
| need_update_(false),
|
| - last_sent_empty_(true) {}
|
| + last_sent_empty_(true) {
|
| +}
|
|
|
| DnsConfigService::~DnsConfigService() {
|
| }
|
| @@ -284,10 +284,7 @@ void DnsConfigService::StartTimer() {
|
| // within 150ms with the rare exception of I/O block or extra large HOSTS.
|
| const base::TimeDelta kTimeout = base::TimeDelta::FromMilliseconds(150);
|
|
|
| - timer_.Start(FROM_HERE,
|
| - kTimeout,
|
| - this,
|
| - &DnsConfigService::OnTimeout);
|
| + timer_.Start(FROM_HERE, kTimeout, this, &DnsConfigService::OnTimeout);
|
| }
|
|
|
| void DnsConfigService::OnTimeout() {
|
| @@ -317,4 +314,3 @@ void DnsConfigService::OnCompleteConfig() {
|
| }
|
|
|
| } // namespace net
|
| -
|
|
|