Upstream: Build net_unittests for Android.

net/dns/dns_config_service_posix.cc

Index: net/dns/dns_config_service_posix.cc
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
index 3385c52c3e479fe296cc3dcc897cd7e8f6c6fce8..062e3bb21926c7b3ff54630f18355763012d645e 100644
--- a/net/dns/dns_config_service_posix.cc
+++ b/net/dns/dns_config_service_posix.cc
@@ -30,22 +30,22 @@ class DnsConfigServicePosix::ConfigReader : public SerialWorker {
       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;
     }
+#endif
 #if defined(OS_MACOSX)
     res_ndestroy(&res);
-#elif !defined(OS_OPENBSD)
+#elif !defined(OS_OPENBSD) && !defined(ANDROID)
     res_nclose(&res);
 #endif
   }
@@ -84,6 +84,7 @@ 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);
@@ -136,5 +137,6 @@ bool ConvertResToConfig(const struct __res_state& res, DnsConfig* dns_config) {
 
   return true;
 }
+#endif
 
 }  // namespace net