Upstream: Build net_unittests for Android.

net/base/host_resolver_impl.cc

 // Copyright (c) 2011 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 <Winsock2.h>
 #elif defined(OS_POSIX)
 #include <netdb.h>
@@ skipping 1067 matching lines @@
   if (max_retry_attempts_ == HostResolver::kDefaultRetryAttempts)
     max_retry_attempts_ = kDefaultMaxRetryAttempts;
 
   // It is cumbersome to expose all of the constraints in the constructor,
   // so we choose some defaults, which users can override later.
   job_pools_[POOL_NORMAL] = new JobPool(max_jobs, 100u * max_jobs);
 
 #if defined(OS_WIN)
   EnsureWinsockInit();
 #endif
 #if defined(OS_POSIX) && !defined(OS_MACOSX)

[joth, 2011/11/02 18:57:05]

ISTM this #if clause should match the one below: if we set
HOST_RESOLVER_LOOPBACK_ONLY here it could only be unset by the OnDNSChanged
callback.

so I wonder (a) why they area already different (bug in openbsd port?) and (b)
if they can just be merged into one combined chunk.

For bonus points, I'd love a quick comment here as a reminder why we only care
about HOST_RESOLVER_LOOPBACK_ONLY on certain platforms.... :)
My reading of host_resolver_proc.cc is it comes down to AI_ADDRCONFIG handling,
and in that it should be identical to Linux hence we will want this at some
point.

   if (HaveOnlyLoopbackAddresses())
     additional_resolver_flags_ |= HOST_RESOLVER_LOOPBACK_ONLY;
 #endif
   NetworkChangeNotifier::AddIPAddressObserver(this);
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)

[joth, 2011/11/02 18:57:05]

nit: word wrap

[Jing Zhao, 2011/11/03 17:49:08]

Just found I only want to skip EnsureDnsReloaderInit() for Android.

   EnsureDnsReloaderInit();
   NetworkChangeNotifier::AddDNSObserver(this);
 #endif
 }
 
 HostResolverImpl::~HostResolverImpl() {
   // Cancel the outstanding jobs. Those jobs may contain several attached
   // requests, which will also be cancelled.
   DiscardIPv6ProbeJob();
 
@@ skipping 550 matching lines @@
   // resolv.conf changes so we don't need to do anything to clear that cache.
   if (cache_.get())
     cache_->clear();
   // Existing jobs will have been sent to the original server so they need to
   // be aborted. TODO(Craig): Should these jobs be restarted?
   AbortAllInProgressJobs();
   // |this| may be deleted inside AbortAllInProgressJobs().
 }
 
 }  // namespace net