replace platform conditions with os_posix and os_bsd where applicable

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 66 matching lines @@
 #endif
 
 // Gets a list of the likely error codes that getaddrinfo() can return
 // (non-exhaustive). These are the error codes that we will track via
 // a histogram.
 std::vector<int> GetAllGetAddrinfoOSErrors() {
   int os_errors[] = {
 #if defined(OS_POSIX)
 #if !defined(OS_FREEBSD)
 #if !defined(OS_ANDROID)
-    // EAI_ADDRFAMILY has been declared obsolete in Android's netdb.h.
+    // EAI_ADDRFAMILY has been declared obsolete in Android's and
+    // FreeBSD's netdb.h.
     EAI_ADDRFAMILY,
 #endif
+    // EAI_NODATA has been declared obsolete in FreeBSD's netdb.h.
     EAI_NODATA,
 #endif

[wtc, 2011/11/30 01:08:15]

It seems better to use independent ifdefs rather than nesting
them:

#if !defined(OS_ANDROID) && !defined(OS_FREEBSD)
    // ...
    EAI_ADDRFAMILY,
#endif
#if !defined(OS_FREEBSD)
    // ...
    EAI_NODATA,
#endif

     EAI_AGAIN,
     EAI_BADFLAGS,
     EAI_FAIL,
     EAI_FAMILY,
     EAI_MEMORY,
     EAI_NONAME,
     EAI_SERVICE,
     EAI_SOCKTYPE,
     EAI_SYSTEM,
 #elif defined(OS_WIN)
@@ skipping 1492 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