Make it possible to use ThreadLocalStorage::Slot as a static without

net/base/dns_reloader.cc

 // Copyright (c) 2012 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/dns_reloader.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
     !defined(OS_ANDROID)
 
 #include <resolv.h>
@@ skipping 75 matching lines @@
 
   ~DnsReloader() {
     NOTREACHED();  // LeakyLazyInstance is not destructed.
   }
 
   base::Lock lock_;  // Protects resolver_generation_.
   int resolver_generation_;
   friend struct base::DefaultLazyInstanceTraits<DnsReloader>;
 
   // We use thread local storage to identify which ReloadState to interact with.
-  static base::ThreadLocalStorage::Slot tls_index_ ;
+  static base::ThreadLocalStorage::StaticSlot tls_index_;
 
   DISALLOW_COPY_AND_ASSIGN(DnsReloader);
 };
 
 // A TLS slot to the ReloadState for the current thread.
 // static
-base::ThreadLocalStorage::Slot DnsReloader::tls_index_(
-    base::LINKER_INITIALIZED);
+base::ThreadLocalStorage::StaticSlot DnsReloader::tls_index_ = TLS_INITIALIZER;
 
 base::LazyInstance<DnsReloader>::Leaky
     g_dns_reloader = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace net {
 
 void EnsureDnsReloaderInit() {
   DnsReloader* t ALLOW_UNUSED = g_dns_reloader.Pointer();
 }
 
 void DnsReloaderMaybeReload() {
   // This routine can be called by any of the DNS worker threads.
   DnsReloader* dns_reloader = g_dns_reloader.Pointer();
   dns_reloader->MaybeReload();
 }
 
 }  // namespace net
 
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) &&
         // !defined(OS_ANDROID)