Revert 99666 (sync tests started failing on mac10.6:

net/base/dnsrr_resolver.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/dnsrr_resolver.h"
 
 #if defined(OS_POSIX)
 #include <resolv.h>
 #endif
 
 #if defined(OS_WIN)
 #include <windns.h>
 #endif
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "base/threading/worker_pool.h"
-#include "net/base/dns_reloader.h"
+#include "net/base/dns_reload_timer.h"
 #include "net/base/dns_util.h"
 #include "net/base/net_errors.h"
 
 // Life of a query:
 //
 // DnsRRResolver RRResolverJob RRResolverWorker       ...         Handle
 //      |                       (origin loop)    (worker loop)
 //      |
 //   Resolve()
 //      |---->-------------------<creates>
@@ skipping 143 matching lines @@
 
   void Run() {
     // Runs on a worker thread.
 
     if (HandleTestCases()) {
       Finish();
       return;
     }
 
     bool r = true;
-#if defined(OS_MACOSX) || defined(OS_OPENBSD)
     if ((_res.options & RES_INIT) == 0) {
       if (res_ninit(&_res) != 0)
         r = false;
     }
-#else
-    DnsReloaderMaybeReload();
-#endif
 
     if (r) {
       unsigned long saved_options = _res.options;
       r = Do();
+
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
+      if (!r && DnsReloadTimerHasExpired()) {
+        // When there's no network connection, _res may not be initialized by
+        // getaddrinfo. Therefore, we call res_nclose only when there are ns
+        // entries.
+        if (_res.nscount > 0)
+          res_nclose(&_res);
+        if (res_ninit(&_res) == 0)
+          r = Do();
+      }
+#endif
       _res.options = saved_options;
     }
 
     response_.fetch_time = base::Time::Now();
 
     if (r) {
       result_ = OK;
     } else {
       result_ = ERR_NAME_NOT_RESOLVED;
       response_.negative = true;
@@ skipping 456 matching lines @@
   inflight_.erase(j);
 
   job->HandleResult(result, response);
   delete job;
 }
 
 }  // namespace net
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(net::RRResolverHandle);
 DISABLE_RUNNABLE_METHOD_REFCOUNT(net::RRResolverWorker);