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

net/dns/dns_config_service_posix.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_posix.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file.h"
@@ skipping 132 matching lines @@
     case CONFIG_PARSE_POSIX_OK:
       break;
     case CONFIG_PARSE_POSIX_UNHANDLED_OPTIONS:
       LOG(WARNING) << "dns_config has unhandled options!";
       config->unhandled_options = true;
     default:
       return error;
   }
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
   // Override timeout value to match default setting on Windows.
-  config->timeout = base::TimeDelta::FromSeconds(kDnsTimeoutSeconds);
+  config->timeout = base::TimeDelta::FromMilliseconds(kDnsDefaultTimeoutMs);
   return result;
 }
 #else  // defined(OS_ANDROID)
 // Theoretically, this is bad. __system_property_get is not a supported API
 // (but it's currently visible to anyone using Bionic), and the properties
 // are implementation details that may disappear in future Android releases.
 // Practically, libcutils provides property_get, which is a public API, and the
 // DNS code (and its clients) are already robust against failing to get the DNS
 // config for whatever reason, so the properties can disappear and the world
 // won't end.
@@ skipping 419 matching lines @@
 #endif  // defined(OS_ANDROID)
 
 }  // namespace internal
 
 // static
 scoped_ptr<DnsConfigService> DnsConfigService::CreateSystemService() {
   return scoped_ptr<DnsConfigService>(new internal::DnsConfigServicePosix());
 }
 
 }  // namespace net