Upstream: Build net_unittests for Android.

net/dns/dns_config_service_posix.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/dns/dns_config_service_posix.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 12 matching lines @@
 
 // A SerialWorker that uses ResolverLib to initialize res_state and converts
 // it to DnsConfig.
 class DnsConfigServicePosix::ConfigReader : public SerialWorker {
  public:
   explicit ConfigReader(DnsConfigServicePosix* service)
     : service_(service),
       success_(false) {}
 
   void DoWork() OVERRIDE {
+    // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+    // res_init behaves the same way.
+    success_ = false;

[joth, 2011/11/03 19:45:02]

I like this tidy up in terms of un-interleaving the #if and normal ifs, however
this comment doesn't seem to make sense up here - maybe move down into one of
the blocks below (next to the if()

also, I'd be tempted to put an outer #if !defined(OS_ANDROID) around the entire
rest of the method just to make it clear the success_ = false is the only bit we
need.
(And maybe a NOTIMPLEMENTED for the ANDROID case)

[Jing Zhao, 2011/11/04 08:01:43]

Done.

 #if defined(OS_OPENBSD)
     if ((res_init() == 0) && (_res.options & RES_INIT)) {
       success_ = ConvertResToConfig(_res, &dns_config_);
-#else
+    }
+#elif !defined(OS_ANDROID)
     struct __res_state res;
     if ((res_ninit(&res) == 0) && (res.options & RES_INIT)) {
       success_ = ConvertResToConfig(res, &dns_config_);
+    }
 #endif
-    } else {
-      // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
-      // res_init behaves the same way.
-      success_ = false;
-    }
 #if defined(OS_MACOSX)
     res_ndestroy(&res);
-#elif !defined(OS_OPENBSD)
+#elif !defined(OS_OPENBSD) && !defined(ANDROID)
     res_nclose(&res);
 #endif
   }
 
   void OnWorkFinished() OVERRIDE {
     DCHECK(!IsCancelled());
     if (success_)
       service_->OnConfigRead(dns_config_);
   }
 
@@ skipping 18 matching lines @@
                               new ConfigReader(this));
   FilePath hosts_path(FILE_PATH_LITERAL("/etc/hosts"));
   hosts_watcher_->StartWatch(hosts_path, new DnsHostsReader(hosts_path, this));
 }
 
 // static
 DnsConfigService* DnsConfigService::CreateSystemService() {
   return new DnsConfigServicePosix();
 }
 
+#if !defined(OS_ANDROID)
 bool ConvertResToConfig(const struct __res_state& res, DnsConfig* dns_config) {
   CHECK(dns_config != NULL);
   DCHECK(res.options & RES_INIT);
 
   dns_config->nameservers.clear();
 
 #if defined(OS_LINUX)
   // Initially, glibc stores IPv6 in _ext.nsaddrs and IPv4 in nsaddr_list.
   // Next (res_send.c::__libc_res_nsend), it copies nsaddr_list after nsaddrs.
   // If RES_ROTATE is enabled, the list is shifted left after each res_send.
@@ skipping 32 matching lines @@
   dns_config->ndots = res.ndots;
   dns_config->timeout = base::TimeDelta::FromSeconds(res.retrans);
   dns_config->attempts = res.retry;
 #if defined(RES_ROTATE)
   dns_config->rotate = res.options & RES_ROTATE;
 #endif
   dns_config->edns0 = res.options & RES_USE_EDNS0;
 
   return true;
 }
+#endif
 
 }  // namespace net