Switch thread_local to use chromium's TLS implementation

base/threading/thread_local.h

 // 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.
 
 // WARNING: Thread local storage is a bit tricky to get right.  Please make
 // sure that this is really the proper solution for what you're trying to
 // achieve.  Don't prematurely optimize, most likely you can just use a Lock.
 //
 // These classes implement a wrapper around the platform's TLS storage
 // mechanism.  On construction, they will allocate a TLS slot, and free the
@@ skipping 32 matching lines @@
 //   // NULL if there isn't a MyClass associated.
 //   MyClass* MyClass::current() {
 //     return Singleton<ThreadLocalPointer<MyClass> >::get()->Get();
 //   }
 
 #ifndef BASE_THREADING_THREAD_LOCAL_H_
 #define BASE_THREADING_THREAD_LOCAL_H_
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-
-#if defined(OS_POSIX)
-#include <pthread.h>
-#endif
+#include "base/threading/thread_local_storage.h"
 
 namespace base {
-namespace internal {
-
-// Helper functions that abstract the cross-platform APIs.  Do not use directly.
-struct BASE_EXPORT ThreadLocalPlatform {
-#if defined(OS_WIN)
-  typedef unsigned long SlotType;
-#elif defined(OS_POSIX)
-  typedef pthread_key_t SlotType;
-#endif
-
-  static void AllocateSlot(SlotType* slot);
-  static void FreeSlot(SlotType slot);
-  static void* GetValueFromSlot(SlotType slot);
-  static void SetValueInSlot(SlotType slot, void* value);
-};
-
-}  // namespace internal
 
 template <typename Type>
 class ThreadLocalPointer {
  public:
-  ThreadLocalPointer() : slot_() {
-    internal::ThreadLocalPlatform::AllocateSlot(&slot_);
-  }
+  ThreadLocalPointer() {}
 
-  ~ThreadLocalPointer() {
-    internal::ThreadLocalPlatform::FreeSlot(slot_);
-  }
+  ~ThreadLocalPointer() {}
 
   Type* Get() {
-    return static_cast<Type*>(
-        internal::ThreadLocalPlatform::GetValueFromSlot(slot_));
+    return static_cast<Type*>(slot_.Get());
   }
 
   void Set(Type* ptr) {
-    internal::ThreadLocalPlatform::SetValueInSlot(
-        slot_, const_cast<void*>(static_cast<const void*>(ptr)));
+    slot_.Set(const_cast<void*>(static_cast<const void*>(ptr)));
   }
 
  private:
-  typedef internal::ThreadLocalPlatform::SlotType SlotType;
-
-  SlotType slot_;
+  ThreadLocalStorage::Slot slot_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadLocalPointer<Type>);
 };
 
 class ThreadLocalBoolean {
  public:
   ThreadLocalBoolean() {}
   ~ThreadLocalBoolean() {}
 
   bool Get() {
     return tlp_.Get() != NULL;
   }
 
   void Set(bool val) {
     tlp_.Set(val ? this : NULL);
   }
 
  private:
   ThreadLocalPointer<void> tlp_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadLocalBoolean);
 };
 
 }  // namespace base
 
 #endif  // BASE_THREADING_THREAD_LOCAL_H_