DNS: Per-network-type and Finch-variable timeouts

net/dns/dns_config_service.cc

 // 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.
 
 #include "net/dns/dns_config_service.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/values.h"
 #include "net/base/ip_endpoint.h"
@@ skipping 76 matching lines @@
   if (a == NAME_SERVERS_TYPE_NONE)
     return b;
   if (b == NAME_SERVERS_TYPE_NONE)
     return a;
   if (a == b)
     return a;
   return NAME_SERVERS_TYPE_MIXED;
 }
 
 // Default values are taken from glibc resolv.h except timeout which is set to
-// |kDnsTimeoutSeconds|.
+// |kDnsDefaultTimeoutMs|.
 DnsConfig::DnsConfig()
     : unhandled_options(false),
       append_to_multi_label_name(true),
       randomize_ports(false),
       ndots(1),
-      timeout(base::TimeDelta::FromSeconds(kDnsTimeoutSeconds)),
+      timeout(base::TimeDelta::FromMilliseconds(kDnsDefaultTimeoutMs)),
       attempts(2),
       rotate(false),
       edns0(false),
       use_local_ipv6(false) {}
 
 DnsConfig::DnsConfig(const DnsConfig& other) = default;
 
 DnsConfig::~DnsConfig() {}
 
 bool DnsConfig::Equals(const DnsConfig& d) const {
@@ skipping 198 matching lines @@
   if (watch_failed_) {
     // If a watch failed, the config may not be accurate, so report empty.
     callback_.Run(DnsConfig());
   } else {
     callback_.Run(dns_config_);
   }
 }
 
 }  // namespace net