Add back "default address family" to HostResolver

net/dns/host_resolver_impl.h

Index: net/dns/host_resolver_impl.h
diff --git a/net/dns/host_resolver_impl.h b/net/dns/host_resolver_impl.h
index 0ad7146dfc97ec1a9cdca1647a2df1baf143b12e..7059a78488b23866c36961083994ed4889167cbd 100644
--- a/net/dns/host_resolver_impl.h
+++ b/net/dns/host_resolver_impl.h
@@ -158,6 +158,9 @@ class NET_EXPORT HostResolverImpl
       const PersistCallback& persist_callback,
       std::unique_ptr<const base::Value> old_data) override;
 
+  void SetDefaultAddressFamily(AddressFamily address_family) override;
+  AddressFamily GetDefaultAddressFamily() const override;
+
   void set_proc_params_for_test(const ProcTaskParams& proc_params) {
     proc_params_ = proc_params;
   }
@@ -346,6 +349,11 @@ class NET_EXPORT HostResolverImpl
   // Number of consecutive failures of DnsTask, counted when fallback succeeds.
   unsigned num_dns_failures_;
 
+  // Address family to use when the request doesn't specify one. This is used
+  // only to disable IPv6 in Cronet, and can be removed when support for the

[xunjieli, 2017/02/27 15:41:38]

same here.

[mgersh, 2017/02/28 16:49:06]

Done.

+  // option is no longer needed. See http://crbug.com/696569.
+  AddressFamily default_address_family_;
+
   // True if DnsConfigService detected that system configuration depends on
   // local IPv6 connectivity. Disables probing.
   bool use_local_ipv6_;