Revert "Apply test isolation goodness to net_unittests."

net/base/host_resolver_proc.cc

 // Copyright (c) 2006-2008 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_proc.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <ws2tcpip.h>
@@ skipping 59 matching lines @@
 // universal and even patched systems such as Jaunty appear to need calls
 // to res_ninit to reload the nameserver information in different threads.
 //
 // We adopt the Mozilla solution here which is to call res_ninit when
 // lookups fail and to rate limit the reloading to once per second per
 // thread.
 
 // Keep a timer per calling thread to rate limit the calling of res_ninit.
 class DnsReloadTimer {
  public:
+  DnsReloadTimer() {
+    tls_index_.Initialize(SlotReturnFunction);
+  }
+
+  ~DnsReloadTimer() { }
+
   // Check if the timer for the calling thread has expired. When no
   // timer exists for the calling thread, create one.
   bool Expired() {
     const base::TimeDelta kRetryTime = base::TimeDelta::FromSeconds(1);
     base::TimeTicks now = base::TimeTicks::Now();
     base::TimeTicks* timer_ptr =
       static_cast<base::TimeTicks*>(tls_index_.Get());
 
     if (!timer_ptr) {
       timer_ptr = new base::TimeTicks();
       *timer_ptr = base::TimeTicks::Now();
       tls_index_.Set(timer_ptr);
       // Return true to reload dns info on the first call for each thread.
       return true;
     } else if (now - *timer_ptr > kRetryTime) {
       *timer_ptr = now;
       return true;
     } else {
       return false;
     }
   }
 
   // Free the allocated timer.
   static void SlotReturnFunction(void* data) {
     base::TimeTicks* tls_data = static_cast<base::TimeTicks*>(data);
     delete tls_data;
   }
 
  private:
-  friend struct DefaultSingletonTraits<DnsReloadTimer>;
-
-  DnsReloadTimer() {
-    tls_index_.Initialize(SlotReturnFunction);
-  }
-
-  ~DnsReloadTimer() {
-    SlotReturnFunction(tls_index_.Get());
-    tls_index_.Free();
-  }
-
   // We use thread local storage to identify which base::TimeTicks to
   // interact with.
   static ThreadLocalStorage::Slot tls_index_ ;
 
   DISALLOW_COPY_AND_ASSIGN(DnsReloadTimer);
 };
 
 // A TLS slot to the TimeTicks for the current thread.
 // static
 ThreadLocalStorage::Slot DnsReloadTimer::tls_index_(base::LINKER_INITIALIZED);
@@ skipping 69 matching lines @@
 #endif
 
   if (err)
     return ERR_NAME_NOT_RESOLVED;
 
   addrlist->Adopt(ai);
   return OK;
 }
 
 }  // namespace net