Refactor: Change the interface HostResolver::DisableIPv6() to HostResolver::SetDefaultA...

net/base/host_resolver_impl.cc

 // Copyright (c) 2006-2008 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/base/host_resolver_impl.h"
 
 #if defined(OS_WIN)
 #include <ws2tcpip.h>
 #include <wspiapi.h>  // Needed for Win2k compat.
 #elif defined(OS_POSIX)
@@ skipping 275 matching lines @@
 };
 
 //-----------------------------------------------------------------------------
 
 HostResolverImpl::HostResolverImpl(HostResolverProc* resolver_proc,
                                    int max_cache_entries,
                                    int cache_duration_ms)
     : cache_(max_cache_entries, cache_duration_ms),
       next_request_id_(0),
       resolver_proc_(resolver_proc),
-      disable_ipv6_(false),
+      default_address_family_(ADDRESS_FAMILY_UNSPECIFIED),
       shutdown_(false) {
 #if defined(OS_WIN)
   EnsureWinsockInit();
 #endif
 }
 
 HostResolverImpl::~HostResolverImpl() {
   // Cancel the outstanding jobs. Those jobs may contain several attached
   // requests, which will also be cancelled.
   for (JobMap::iterator it = jobs_.begin(); it != jobs_.end(); ++it)
@@ skipping 16 matching lines @@
 
   // Choose a unique ID number for observers to see.
   int request_id = next_request_id_++;
 
   // Update the load log and notify registered observers.
   OnStartRequest(load_log, request_id, info);
 
   // Build a key that identifies the request in the cache and in the
   // outstanding jobs map.
   Key key(info.hostname(), info.address_family());
-  if (disable_ipv6_)
-    key.address_family = ADDRESS_FAMILY_IPV4;
+  if (key.address_family == ADDRESS_FAMILY_UNSPECIFIED)
+    key.address_family = default_address_family_;
 
   // If we have an unexpired cache entry, use it.
   if (info.allow_cached_response()) {
     const HostCache::Entry* cache_entry = cache_.Lookup(
         key, base::TimeTicks::Now());
     if (cache_entry) {
       addresses->SetFrom(cache_entry->addrlist, info.port());
       int error = cache_entry->error;
 
       // Update the load log and notify registered observers.
@@ skipping 212 matching lines @@
     }
 
     LoadLog::EndEvent(
         load_log, LoadLog::TYPE_HOST_RESOLVER_IMPL_OBSERVER_ONCANCEL);
   }
 
   LoadLog::EndEvent(load_log, LoadLog::TYPE_HOST_RESOLVER_IMPL);
 }
 
 }  // namespace net