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

base/threading/thread_local_storage_unittest.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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <process.h>
 #endif
 
 #include "base/threading/simple_thread.h"
 #include "base/threading/thread_local_storage.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 // Ignore warnings about ptr->int conversions that we use when
 // storing ints into ThreadLocalStorage.
 #pragma warning(disable : 4311 4312)
 #endif
 
 namespace base {
 
 namespace {
 
 const int kInitialTlsValue = 0x5555;
 const int kFinalTlsValue = 0x7777;
 // How many times must a destructor be called before we really are done.
 const int kNumberDestructorCallRepetitions = 3;
 
-static ThreadLocalStorage::Slot tls_slot(LINKER_INITIALIZED);
+static ThreadLocalStorage::StaticSlot tls_slot = TLS_INITIALIZER;
 
 class ThreadLocalStorageRunner : public DelegateSimpleThread::Delegate {
  public:
   explicit ThreadLocalStorageRunner(int* tls_value_ptr)
       : tls_value_ptr_(tls_value_ptr) {}
 
   virtual ~ThreadLocalStorageRunner() {}
 
   virtual void Run() {
     *tls_value_ptr_ = kInitialTlsValue;
@@ skipping 65 matching lines @@
     delete threads[index];
     delete thread_delegates[index];
 
     // Verify that the destructor was called and that we reset.
     EXPECT_EQ(values[index], kFinalTlsValue);
   }
   tls_slot.Free();  // Stop doing callbacks to cleanup threads.
 }
 
 }  // namespace base